diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/all-positive-options-merge | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/all-positive-options-merge b/t/all-positive-options-merge new file mode 100755 index 0000000..eeb21d0 --- /dev/null +++ b/t/all-positive-options-merge @@ -0,0 +1,23 @@ +#!/bin/sh -e +. t/common.sh +interactive + +printf '%s\n' > file \ + "${HEAD} ours" \ + same \ + ours \ + "${PARENT} base" \ + same \ + base \ + "${TAIL}" \ + same \ + theirs \ + "${END} theirs" + +printf '%s\n' > file.expected \ + same \ + ours + +printf '%s' h > input +normal --merge --remove-base --reduce --interactive file 8<input 9>output +test -s output |