blob: 878eeea61e71a6b53e4039410852592d806663a5 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
|
#!/bin/sh -e
. t/common.sh
printf '%s\n' > file \
"${HEAD} HEAD" \
same \
head \
"${TAIL}" \
same \
tail \
"${END} branch"
cp -- file file.expected
conflict --no-reduce file
also_interactive s
|