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

Junio C Hamano committed Jan 7, 2015 at 12:44 UTC f41157e649615ada01f175d00f9bd8c9ea507bca

No changes.