merge-no-conflicts « t - git-rediff - [Complete] Reduce partially resolved merge conflicts

about summary refs log tree commit diff stats

path: root/t/merge-no-conflicts

blob: 5dc58041ce8aedfc46a92f21c76a8f2df6feedd0 (plain) (blame)

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

printf '%s\n' > file \
	no conflicts

cp -- file file.expected

normal --merge --no-reduce file

also_interactive ''