git merge: reword failure message.
[gitweb.git] / t / t6023-merge-rename-nocruft.sh
2006-12-13 Remove uncontested renamed files during merge.