diff options
Diffstat (limited to 't/combination-remove-base-merge-reduce')
| -rwxr-xr-x | t/combination-remove-base-merge-reduce | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/t/combination-remove-base-merge-reduce b/t/combination-remove-base-merge-reduce new file mode 100755 index 0000000..48025c4 --- /dev/null +++ b/t/combination-remove-base-merge-reduce @@ -0,0 +1,34 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + not first \ + "${PARENT} base" \ + not first \ + "${TAIL}" \ + first \ + "${END} theirs" \ + "${HEAD} ours" \ + ours \ + common \ + "${PARENT} base" \ + base \ + common \ + "${TAIL}" \ + theirs \ + common \ + "${END} theirs" + +printf '%s\n' > file.expected \ + first \ + "${HEAD} ours" \ + ours \ + "${TAIL}" \ + theirs \ + "${END} theirs" \ + common + +conflict --remove-base --merge --reduce file + +also_interactive mm |