From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 19:41:49 +0000 (-0700)
Subject: Merge branch 'jk/diff-no-rename-empty'
X-Git-Tag: v1.7.11-rc0~151
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c0599f6993413360d8e35679a6b421d4eb16a698;p=git.git

Merge branch 'jk/diff-no-rename-empty'

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
---

c0599f6993413360d8e35679a6b421d4eb16a698