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