aboutsummaryrefslogtreecommitdiffstats
path: root/t/symmetric-4-same-different-middles
blob: 9d95e435024e0772666ca2e8f8bd53aed0f159c1 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
#!/bin/sh -e
. t/common.sh

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

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

normal --symmetric --no-reduce file

also_interactive y