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