blob: 23a8bb59c56ab415546bba235d5d74b6806cc61e (
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
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > first \
"${HEAD} ours" \
same \
"${PARENT} base" \
same \
"${TAIL}" \
first-different \
"${END} theirs"
printf '%s\n' > first.expected \
first-different
printf '%s\n' > second \
"${HEAD} ours" \
second-different \
"${PARENT} base" \
same \
"${TAIL}" \
same \
"${END} theirs"
printf '%s\n' > second.expected \
second-different
normal --merge --no-reduce first second
also_interactive mm
|
