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} 2" \ 2 \ "${TAIL}" \ 2 \ "${END} theirs" cp -- file file.expected conflict --symmetric --no-reduce file also_interactive y