t/merge-lower-middle-4


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
26
27
28

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

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

printf '%s\n' > file.expected \
	"${HEAD} 1" \
	same \
	"${PARENT} 2" \
	same \
	"${PARENT} 3" \
	different \
	"${TAIL}" \
	same \
	"${END} 4"

conflict --merge --no-reduce file

also_interactive m