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