t/merge-tail-4


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

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

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

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

normal --merge --no-reduce file

also_interactive m