t/unclosed-conflict-head-parent


1
2
3
4
5
6
7
8
9
10
11
12
13
14

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

printf '%s\n' > file \
	"${HEAD} a" \
	first \
	"${PARENT} b" \
	broken

cp -- file file.original

error file

diff -u -- file file.original >&2