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