t/no-option-merge


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} ours" \
	same \
	new \
	"${PARENT} base" \
	same \
	old \
	"${TAIL}" \
	same \
	old \
	"${END} theirs"

printf '%s\n' > file.expected \
	same \
	"${HEAD} ours" \
	new \
	"${PARENT} base" \
	old \
	"${TAIL}" \
	old \
	"${END} theirs"

conflict --no-merge file

also_interactive rr