aboutsummaryrefslogtreecommitdiffstats
path: root/t/marker-size-longer-ignored
blob: 4453d7fdf281464164a5815d871c9ac22f4b6f28 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
#!/bin/sh -e
. t/common.sh

set_conflict_marker_size 3 file

printf '%s\n' > file \
	'<<<< not a marker' \
	'|||| not a marker' \
	'==== not a marker' \
	'>>>> not a marker'

cp -- file file.expected

normal file

also_interactive ''