t/marker-size-3


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18

#!/bin/sh -e
. t/common.sh

set_conflict_marker_size 3 file

printf '%s\n' > file \
	"${HEAD} ours" \
	same \
	"${TAIL}" \
	same \
	"${END} theirs'"

printf '%s\n' > file.expected \
	same

normal file

also_interactive r