blob: 835e751d6ef01467724311d2306a0a363501a962 (
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
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > file \
"${HEAD} ours" \
same \
ours \
"${PARENT} base" \
same \
base \
"${TAIL}" \
same \
theirs \
"${END} theirs"
printf '%s\n' > file.expected \
same \
"${HEAD} ours" \
ours \
"${PARENT} base" \
base \
"${TAIL}" \
theirs \
"${END} theirs"
conflict --remove-base --no-remove-base --no-remove-base file
also_interactive rr
|
