blob: f93cd84478f0ac10ceffb1ca92d4d69e9680af99 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > file \
"${HEAD} ours" \
"${PARENT} 2" \
base \
"${TAIL}" \
"${END} theirs"
: > file.expected
normal --symmetric --no-reduce file
also_interactive y
|