aboutsummaryrefslogtreecommitdiffstats
path: root/t/combination-remove-base-select-head-reduce
blob: 96e828d660d7bac32e80961a0fcb12cc8cc011ef (plain) (blame)
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} ours" \
	ours \
	"${PARENT} base" \
	base \
	"${TAIL}" \
	theirs \
	"${END} theirs"

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

normal --remove-base --select-head --reduce file

also_interactive h