unclosed-conflict-head « t - git-rediff - [Complete] Reduce partially resolved merge conflicts

about summary refs log tree commit diff stats

path: root/t/unclosed-conflict-head

blob: 4a7f4a26fd00af19b93757ee83420be0c0d84941 (plain) (blame)

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

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

cp -- file file.original

error file

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