t/symmetric-5-different-upper-middle


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

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

printf '%s\n' > file \
	"${HEAD} ours" \
	same \
	"${PARENT} 2" \
	different \
	"${PARENT} 3" \
	add \
	"${PARENT} 4" \
	add \
	"${TAIL}" \
	same \
	"${END} theirs"

cp -- file file.expected

conflict --symmetric --no-reduce file

also_interactive y