Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Fri, 20 Oct 2006 04:28:12 +0000 (21:28 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 20 Oct 2006 04:28:12 +0000 (21:28 -0700)
* maint:
git-apply: prepare for upcoming GNU diff -u format change.

1  2 
builtin-apply.c
diff --cc builtin-apply.c
Simple merge