Remove uncontested renamed files during merge.
authorShawn Pearce <spearce@spearce.org>
Wed, 13 Dec 2006 10:42:44 +0000 (05:42 -0500)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 17:13:21 +0000 (09:13 -0800)
commit8371234...caaf6e14fe3f2082a855eff1bbd79ae9
treede64869...fea04a54043b799bfbb552caf6dc173acopy hash to clipboard (tree)
parent1349f87...1310987dd07b679a512e46e1b17e2b8dcopy hash to clipboard (diff)
merge-recursive.c
t/t6023-merge-rename-nocruft.sh [new file with mode: 0755]