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