t/merge-head


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} a" \
	different \
	"${PARENT} b" \
	same \
	"${TAIL}" \
	same \
	"${END} c"

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

normal --merge --no-reduce file

also_interactive m