t/no-option-merge-no-yes


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

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

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

printf '%s\n' > file.expected \
	new

normal --no-merge --merge --no-reduce file

also_interactive m