blob: 713a96c67772148174a84854880aa812c2798634 (
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
35
36
37
38
39
40
41
42
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > file \
before \
"${HEAD} ours" \
same \
"${PARENT} base" \
different-interior \
"${TAIL}" \
same \
"${END} theirs" \
between \
"${HEAD} ours" \
different-head \
"${PARENT} base" \
interior \
"${PARENT} other" \
interior \
"${TAIL}" \
same \
"${END} theirs" \
after
printf '%s\n' > file.expected \
before \
same \
between \
"${HEAD} ours" \
different-head \
"${PARENT} base" \
interior \
"${PARENT} other" \
interior \
"${TAIL}" \
same \
"${END} theirs" \
after
conflict --symmetric --no-reduce file
also_interactive yy
|
