Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Tue, 9 Jan 2007 20:04:30 +0000 (12:04 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 Jan 2007 20:04:30 +0000 (12:04 -0800)
* maint:
  Fix "Do not ignore a detected patchfile brokenness."
  Do not ignore a detected patchfile brokenness.

1  2 
builtin-apply.c

diff --cc builtin-apply.c
Simple merge