aboutsummaryrefslogtreecommitdiffstats
path: root/t/no-option-select-head-yes-no
blob: 3093de57ed44d03e8aa3b297b550d667214a6570 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
#!/bin/sh -e
. t/common.sh

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

cp -- file file.expected

conflict --select-head --no-select-head --no-reduce file

also_interactive s