merge-recursive: don't detect renames of empty files
authorJeff King <peff@peff.net>
Thu, 22 Mar 2012 22:52:24 +0000 (18:52 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Mar 2012 20:52:51 +0000 (13:52 -0700)
commit4f7cb99...da26be5d86402a6e060f3ee16a672f16
treeb12a4ee...448bc55dca8463f5abe52eae37c8be94copy hash to clipboard (tree)
parent90d43b0...687fdc51d1f2fc14948df538dc45584bcopy hash to clipboard (diff)
merge-recursive.c
t/t6022-merge-rename.sh