diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/no-option-remove-base-yes-no | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/no-option-remove-base-yes-no b/t/no-option-remove-base-yes-no new file mode 100755 index 0000000..e93b8ee --- /dev/null +++ b/t/no-option-remove-base-yes-no @@ -0,0 +1,24 @@ +#!/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 \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +conflict --remove-base --no-remove-base --no-reduce file + +also_interactive ss |