Merge branch 'jc/apply-blank-at-eof-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:20 +0000 (19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:20 +0000 (19:03 -0700)
commit89dfd2dfbf4b082c7b1563aa321042f6680efe46
tree5d312abd97c4bfd40f9a16c6e114cfb0a005b0ab
parentc13975e7fd19a6939de264233eed20f93c6d1f46
parent855726395342441808eff5e4e9ad9a2b9254edbc
Merge branch 'jc/apply-blank-at-eof-fix'

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