From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Feb 2007 03:18:16 +0000 (-0800)
Subject: Merge branch 'jc/diff-apply-patch'
X-Git-Tag: v1.5.1-rc1~298
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3eee9c6dbebcf6341ad202f7dd4d416ef3fcba5e;p=git.git

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

3eee9c6dbebcf6341ad202f7dd4d416ef3fcba5e