]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/diff-b-m'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:44:41 +0000 (12:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:44:42 +0000 (12:44 -0800)
Fix long-standing bug in "diff -B -M" output.

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


Trivial merge