blob: c3fdc0fc151e810546b4946ccf4eac046c7ea5d3 (
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
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > file \
"${HEAD} first" \
first-head \
"${TAIL}" \
first-tail \
"${END}" \
between \
"${HEAD} second" \
second-head \
"${PARENT} middle" \
second-middle \
"${TAIL}" \
second-tail \
"${END}" \
after
printf '%s\n' > file.expected \
"${HEAD} first" \
first-head \
"${TAIL}" \
first-tail \
"${END}" \
between \
"${HEAD} second" \
second-head \
"${TAIL}" \
second-tail \
"${END}" \
after
conflict --remove-base --no-reduce file
also_interactive bbbb
|
