diff options
Diffstat (limited to 't/all-positive-options-merge')
| -rwxr-xr-x | t/all-positive-options-merge | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/t/all-positive-options-merge b/t/all-positive-options-merge deleted file mode 100755 index eeb21d0..0000000 --- a/t/all-positive-options-merge +++ /dev/null @@ -1,23 +0,0 @@ -#!/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 |