aboutsummaryrefslogtreecommitdiffstats
path: root/t/no-option-symmetric-no-yes
blob: 45954cbf3b8476de937de93d14bb512f313db3af (plain) (blame)
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" \
	new \
	"${PARENT} base" \
	old \
	"${TAIL}" \
	new \
	"${END} theirs"

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

normal --no-symmetric --symmetric --no-reduce file

also_interactive y