1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
#!/bin/sh -e . t/common.sh printf '%s\n' > file \ "${HEAD} ours" \ ours \ "${PARENT} base" \ base \ "${TAIL}" \ theirs \ "${END} theirs" printf '%s\n' > file.expected \ theirs normal --select-tail --no-reduce file also_interactive t