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