blob: 7aaccbcbda9bc65bf1cac21c2728c5a16ad50f91 (
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 \
before \
"${HEAD} ours" \
same \
"${PARENT} base" \
same \
"${TAIL}" \
different-three \
"${END} theirs" \
between \
"${HEAD} ours" \
different-four \
"${PARENT} base" \
same \
"${PARENT} other" \
same \
"${TAIL}" \
same \
"${END} theirs" \
after
printf '%s\n' > file.expected \
before \
different-three \
between \
different-four \
after
normal --merge --no-reduce file
also_interactive mm
|
