Merge branch 'jc/diff-apply-patch'

* jc/diff-apply-patch:
git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)

diff --cc diff.c
Simple merge