t/remove-base-4


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

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

printf '%s\n' > file \
	"${HEAD} head" \
	head \
	"${PARENT} 2" \
	second \
	"${PARENT} 3" \
	third \
	"${TAIL}" \
	tail \
	"${END} tail"

cp -- file file.expected

conflict --remove-base --no-reduce file

also_interactive b