#!/bin/sh -e . t/common.sh printf '%s\n' > file \ "${HEAD} 1" \ head-common-first \ head-common-second \ branch-1-first \ branch-1-second \ "${PARENT} 2" \ head-common-first \ head-common-second \ branch-2-first \ branch-2-second \ "${TAIL} 3" \ head-common-first \ head-common-second \ branch-3-first \ branch-3-second \ "${END} 3" cp -- file file.expected conflict --no-reduce file also_interactive s