t/no-reduce-2-head


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} 1" \
	head-common-first \
	head-common-second \
	branch-1-first \
	branch-1-second \
	"${TAIL} 2" \
	head-common-first \
	head-common-second \
	branch-2-first \
	branch-2-second \
	"${END} 2"

cp -- file file.expected

conflict --no-reduce file

also_interactive s