#!/bin/sh -e . t/common.sh printf '%s\n' > file \ "${HEAD} ours" \ same \ new \ "${PARENT} base" \ same \ old \ "${TAIL}" \ same \ old \ "${END} theirs" printf '%s\n' > file.expected \ same \ "${HEAD} ours" \ new \ "${PARENT} base" \ old \ "${TAIL}" \ old \ "${END} theirs" conflict --no-merge file also_interactive rr