blob: 3ae2034e2712139790cafc2f130c99d8d50bc266 (
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
|
#!/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 \
"${TAIL} 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 \
"${END} 4"
cp -- file file.expected
conflict --no-reduce file
also_interactive s
|
