t/combination-merge-symmetric


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26

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

printf '%s\n' > file \
	"${HEAD} 1" \
	old-1 \
	"${PARENT} 1" \
	old-1 \
	"${TAIL} 1" \
	new-1 \
	"${END} 1" \
	"${HEAD} 2" \
	new-2 \
	"${PARENT} 2" \
	old-2 \
	"${TAIL} 2" \
	new-2 \
	"${END} 2"

printf '%s\n' > file.expected \
	new-1 \
	new-2

normal --merge --symmetric --no-reduce file

also_interactive my