t/merge-base


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} a" \
	same \
	"${PARENT} b" \
	different \
	"${TAIL}" \
	same \
	"${END} c"

cp -- file file.expected

conflict --merge --no-reduce file

also_interactive m