blob: 58202d19153fce75594978a8e33b74b8981256d2 (
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
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > file \
"${HEAD} 1" \
before-common-first \
before-common-second \
head-only-first \
head-only-second \
middle-common-first \
middle-common-second \
head-last \
"${TAIL} 2" \
before-common-first \
before-common-second \
tail-only \
middle-common-first \
middle-common-second \
tail-last-first \
tail-last-second \
"${END} 2"
printf '%s\n' > file.expected \
before-common-first \
before-common-second \
"${HEAD} 1" \
head-only-first \
head-only-second \
"${TAIL} 2" \
tail-only \
"${END} 2" \
middle-common-first \
middle-common-second \
"${HEAD} 1" \
head-last \
"${TAIL} 2" \
tail-last-first \
tail-last-second \
"${END} 2"
conflict --reduce file
also_interactive rrr
|
