Merge branch 'jk/diff-no-rename-empty'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:41:49 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:41:49 +0000 (12:41 -0700)
Forbids rename detection logic from matching two empty files as renames
during merge-recursive to prevent mismerges.

By Jeff King
* jk/diff-no-rename-empty:
merge-recursive: don't detect renames of empty files
teach diffcore-rename to optionally ignore empty content
make is_empty_blob_sha1 available everywhere
drop casts from users EMPTY_TREE_SHA1_BIN

No differences found