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