From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Jan 2015 20:44:41 +0000 (-0800)
Subject: Merge branch 'jc/diff-b-m'
X-Git-Tag: v2.3.0-rc0~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f41157e649615ada01f175d00f9bd8c9ea507bca;p=thirdparty%2Fgit.git

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

f41157e649615ada01f175d00f9bd8c9ea507bca