blob: 49f47c2bb0a67af15207a9cba929b53c4ce1c4aa (
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" \
common-first \
common-second \
common-third \
"${PARENT} 2" \
common-first \
common-second \
common-third \
"${PARENT} 3" \
common-first \
common-second \
common-third \
"${TAIL} 4" \
common-first \
common-second \
common-third \
"${END} 4"
cp -- file file.expected
conflict --no-reduce file
also_interactive s
|
