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