Merge branch 'maint'
commit240897e908e48e8f8c8d5555522afe255b3b734b
authorJunio C Hamano <junkio@cox.net>
Tue, 9 Jan 2007 20:04:30 +0000 (9 12:04 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 Jan 2007 20:04:30 +0000 (9 12:04 -0800)
tree3dc44694521cd6cde6752907140beff90e3395d6
parent1295228d1fdda17c2ef62e712649c962c3da5eb7
parent6534141151f7fd4334f62827d9234acf3974ca4d
Merge branch 'maint'

* maint:
  Fix "Do not ignore a detected patchfile brokenness."
  Do not ignore a detected patchfile brokenness.
builtin-apply.c