blob: 542435fa9fb54e34c2a9a0635d5b98dca256bfa1 (
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
|
#!/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"
cp -- file file.expected
conflict --no-reduce file
also_interactive s
|
