aboutsummaryrefslogtreecommitdiffstats
path: root/t/merge-1
blob: 5967f4eb1f18fa4b745669e198cd63d33cf68e63 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
#!/bin/sh -e
. t/common.sh

printf '%s\n' > file \
	"${HEAD} only" \
	only \
	"${END} only"

cp -- file file.expected

error --merge --no-reduce file