blob: a85ca8c7320195f94fc708ec92aa16f2c0c08d87 (
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
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > file \
"${HEAD} 1" \
head-common-first \
head-common-second \
branch-1-first \
branch-1-second \
"${PARENT} 2" \
head-common-first \
head-common-second \
branch-2-first \
branch-2-second \
"${PARENT} 3" \
head-common-first \
head-common-second \
branch-3-first \
branch-3-second \
"${PARENT} 4" \
head-common-first \
head-common-second \
branch-4-first \
branch-4-second \
"${TAIL} 5" \
head-common-first \
head-common-second \
branch-5-first \
branch-5-second \
"${END} 5"
printf '%s\n' > file.expected \
head-common-first \
head-common-second \
"${HEAD} 1" \
branch-1-first \
branch-1-second \
"${PARENT} 2" \
branch-2-first \
branch-2-second \
"${PARENT} 3" \
branch-3-first \
branch-3-second \
"${PARENT} 4" \
branch-4-first \
branch-4-second \
"${TAIL} 5" \
branch-5-first \
branch-5-second \
"${END} 5"
conflict --reduce file
also_interactive rr
|
