diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/remove-base-3-empty-base | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/remove-base-3-empty-base b/t/remove-base-3-empty-base new file mode 100755 index 0000000..b3e009d --- /dev/null +++ b/t/remove-base-3-empty-base @@ -0,0 +1,21 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + ours \ + "${PARENT} 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 |
