Code

Merge branch 'jc/apply-blank-at-eof-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:26 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:26 +0000 (10:49 -0700)
commite63f87a6f7a4e55f50e67b112f26d9a1e4e7f3ab
tree613c9ce697b049f70961c26761230f54ec47b249
parent6e89b37d34f9a58182192664f304c15f525be4d2
parent855726395342441808eff5e4e9ad9a2b9254edbc
Merge branch 'jc/apply-blank-at-eof-fix' into maint

* jc/apply-blank-at-eof-fix:
  apply --whitespace=error: correctly report new blank lines at end
builtin/apply.c