blob: 48025c41e468132280bf0179c993c53cf5a13a72 (
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
30
31
32
33
34
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > file \
"${HEAD} ours" \
not first \
"${PARENT} base" \
not first \
"${TAIL}" \
first \
"${END} theirs" \
"${HEAD} ours" \
ours \
common \
"${PARENT} base" \
base \
common \
"${TAIL}" \
theirs \
common \
"${END} theirs"
printf '%s\n' > file.expected \
first \
"${HEAD} ours" \
ours \
"${TAIL}" \
theirs \
"${END} theirs" \
common
conflict --remove-base --merge --reduce file
also_interactive mm
|
