Merge branch 'jc/diff-apply-patch'
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Feb 2007 03:18:16 +0000 (19:18 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Feb 2007 03:18:16 +0000 (19:18 -0800)
commit3eee9c6dbebcf6341ad202f7dd4d416ef3fcba5e
tree87918d8cc2eb5a6cff17b807a64798a0bf6ed848
parent4a164d48df6bb1b4a771741c63d4437fd2dca0bb
parent1a9eb3b9d50367bee8fe85022684d812816fe531
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.c