Junio C Hamano d1d95c5727 Merge branch 'jk/diff-no-rename-empty' into next ...

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

2012-04-12 14:02:11 -07:00

129 KiB

Raw Blame History

View Raw