blob: 3826bc62dacfa1a04e4ec3b87db9a99ee92a2fdb (
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
|
#!/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 \
"${PARENT} 4" \
branch-4-before-first \
branch-4-before-second \
middle-common-first \
middle-common-second \
branch-4-after-first \
branch-4-after-second \
"${TAIL} 5" \
branch-5-before-first \
branch-5-before-second \
middle-common-first \
middle-common-second \
branch-5-after-first \
branch-5-after-second \
"${END} 5"
cp -- file file.expected
conflict --no-reduce file
also_interactive s
|
