t/no-option-merge-yes-no


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

#!/bin/sh -e
. t/common.sh

printf '%s\n' > file \
	"${HEAD} ours" \
	old \
	"${PARENT} base" \
	old \
	"${TAIL}" \
	new \
	"${END} theirs"

cp -- file file.expected

conflict --merge --no-merge file

also_interactive r