blob: 86d2235d82d88032db3e4f75de3a3bc89e84c2cc (
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
24
25
26
27
28
29
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > first \
"${HEAD} ours" \
same \
"${PARENT} base" \
different \
"${TAIL}" \
same \
"${END} theirs"
printf '%s\n' > first.expected \
same
printf '%s\n' > second \
"${HEAD} ours" \
different \
"${PARENT} base" \
interior \
"${TAIL}" \
same \
"${END} theirs"
cp -- second second.expected
conflict --symmetric --no-reduce first second
also_interactive yy
|
