Merge branch 'ag/patch-header-verify'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 04:28:51 +0000 (20:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 04:28:51 +0000 (20:28 -0800)
* ag/patch-header-verify:
  builtin-apply.c: fix the --- and +++ header filename consistency check

1  2 
builtin-apply.c

diff --cc builtin-apply.c
Simple merge