blob: c333b0f7cb9b7597f907e4425cf717641fb3ea93 (
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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > file \
"${HEAD} 1" \
branch-1-before-first \
branch-1-before-second \
middle-common-first \
middle-common-second \
branch-1-after-first \
branch-1-after-second \
"${PARENT} 2" \
branch-2-before-first \
branch-2-before-second \
middle-common-first \
middle-common-second \
branch-2-after-first \
branch-2-after-second \
"${PARENT} 3" \
branch-3-before-first \
branch-3-before-second \
middle-common-first \
middle-common-second \
branch-3-after-first \
branch-3-after-second \
"${TAIL} 4" \
branch-4-before-first \
branch-4-before-second \
middle-common-first \
middle-common-second \
branch-4-after-first \
branch-4-after-second \
"${END} 4"
printf '%s\n' > file.expected \
"${HEAD} 1" \
branch-1-before-first \
branch-1-before-second \
"${PARENT} 2" \
branch-2-before-first \
branch-2-before-second \
"${PARENT} 3" \
branch-3-before-first \
branch-3-before-second \
"${TAIL} 4" \
branch-4-before-first \
branch-4-before-second \
"${END} 4" \
middle-common-first \
middle-common-second \
"${HEAD} 1" \
branch-1-after-first \
branch-1-after-second \
"${PARENT} 2" \
branch-2-after-first \
branch-2-after-second \
"${PARENT} 3" \
branch-3-after-first \
branch-3-after-second \
"${TAIL} 4" \
branch-4-after-first \
branch-4-after-second \
"${END} 4"
conflict --reduce file
also_interactive rrr
|
