unexpected-separator-parent « t - git-rediff - [Complete] Reduce partially resolved merge conflicts

about summary refs log tree commit diff stats

path: root/t/unexpected-separator-parent

blob: 1b86d70f0368203bb22b5be63edc6ad20e9d806e (plain) (blame)

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

printf '%s\n' > file \
	"${PARENT} base"

cp -- file file.original

error file

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