t/no-reduce-2-files


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

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

printf '%s\n' > file \
	"${HEAD} ours" \
	first \
	"${TAIL}" \
	first \
	"${END} theirs"

cp -- file file.expected

printf '%s\n' > file2 \
	"${HEAD} ours" \
	second \
	"${TAIL}" \
	second \
	"${END} theirs"

cp -- file2 file2.expected

conflict --no-reduce file file2

also_interactive ss