blob: e95805f21c8a6500a4aa34243118fc1c14ce942b (
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
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > file \
"${HEAD} 1" \
head-common-first \
head-common-second \
branch-1-first-a \
branch-1-first-b \
middle-common-first \
middle-common-second \
branch-1-second-a \
branch-1-second-b \
tail-common-first \
tail-common-second \
"${PARENT} 2" \
head-common-first \
head-common-second \
branch-2-first-a \
branch-2-first-b \
middle-common-first \
middle-common-second \
branch-2-second-a \
branch-2-second-b \
tail-common-first \
tail-common-second \
"${PARENT} 3" \
head-common-first \
head-common-second \
branch-3-first-a \
branch-3-first-b \
middle-common-first \
middle-common-second \
branch-3-second-a \
branch-3-second-b \
tail-common-first \
tail-common-second \
"${PARENT} 4" \
head-common-first \
head-common-second \
branch-4-first-a \
branch-4-first-b \
middle-common-first \
middle-common-second \
branch-4-second-a \
branch-4-second-b \
tail-common-first \
tail-common-second \
"${TAIL} 5" \
head-common-first \
head-common-second \
branch-5-first-a \
branch-5-first-b \
middle-common-first \
middle-common-second \
branch-5-second-a \
branch-5-second-b \
tail-common-first \
tail-common-second \
"${END} 5"
printf '%s\n' > file.expected \
head-common-first \
head-common-second \
"${HEAD} 1" \
branch-1-first-a \
branch-1-first-b \
"${PARENT} 2" \
branch-2-first-a \
branch-2-first-b \
"${PARENT} 3" \
branch-3-first-a \
branch-3-first-b \
"${PARENT} 4" \
branch-4-first-a \
branch-4-first-b \
"${TAIL} 5" \
branch-5-first-a \
branch-5-first-b \
"${END} 5" \
middle-common-first \
middle-common-second \
"${HEAD} 1" \
branch-1-second-a \
branch-1-second-b \
"${PARENT} 2" \
branch-2-second-a \
branch-2-second-b \
"${PARENT} 3" \
branch-3-second-a \
branch-3-second-b \
"${PARENT} 4" \
branch-4-second-a \
branch-4-second-b \
"${TAIL} 5" \
branch-5-second-a \
branch-5-second-b \
"${END} 5" \
tail-common-first \
tail-common-second
conflict --reduce file
also_interactive rrr
|
