1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
#!/bin/sh -e . t/common.sh printf '%s\n' > file \ "${HEAD} 1" \ common-first \ common-second \ common-third \ "${TAIL} 2" \ common-first \ common-second \ common-third \ "${END} 2" cp -- file file.expected conflict --no-reduce file also_interactive s