From: Junio C Hamano <junkio@cox.net>
Date: Fri, 20 Oct 2006 04:28:12 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.4-rc1~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e19343ad547e32aaf511b0b38be083e1b3145d4e;p=thirdparty%2Fgit.git

Merge branch 'maint'

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

e19343ad547e32aaf511b0b38be083e1b3145d4e