aboutsummaryrefslogtreecommitdiffstats
path: root/t/all-positive-options-merge-symmetric
blob: 03d3879b5748f8f101d9ae0bdfa382661585e90b (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
#!/bin/sh -e
. t/common.sh
interactive

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

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

printf '%s' h > input
normal --merge --symmetric --remove-base --reduce --interactive file 8<input 9>output
test -s output