diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/combination-interactive-2-no-interactive | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/t/combination-interactive-2-no-interactive b/t/combination-interactive-2-no-interactive new file mode 100755 index 0000000..1126b8c --- /dev/null +++ b/t/combination-interactive-2-no-interactive @@ -0,0 +1,29 @@ +#!/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 \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +printf '%s' q > input +conflict --interactive --no-interactive --no-interactive file 8<input 9>output +test ! -s output |