Merge branch 'maint'
commite19343ad547e32aaf511b0b38be083e1b3145d4e
authorJunio C Hamano <junkio@cox.net>
Fri, 20 Oct 2006 04:28:12 +0000 (19 21:28 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 20 Oct 2006 04:28:12 +0000 (19 21:28 -0700)
treebb2001ed8cb2b4857f5694f80a108bdb1e9fecb9
parent7768e27e1d3f3d5e253e795433033b5de1d1c157
parentb507b465f7831612b9d9fc643e3e5218b64e5bfa
Merge branch 'maint'

* maint:
  git-apply: prepare for upcoming GNU diff -u format change.
builtin-apply.c