Merge branch 'jc/diff-b-m'
commitf41157e649615ada01f175d00f9bd8c9ea507bca
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:44:41 +0000 (7 12:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:44:42 +0000 (7 12:44 -0800)
tree0c6afd1da029f0ae2697954576058f7d2de53ca2
parentd35c8027937546e6b22a2f28123f731c84e3b380
parent6936b5859c47b826437218fbfc0e2bc0935f7136
Merge branch 'jc/diff-b-m'

Fix long-standing bug in "diff -B -M" output.

* jc/diff-b-m:
  diff -B -M: fix output for "copy and then rewrite" case