Merge branch 'cm/diff-check-at-eol' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2010 18:36:10 +0000 (10:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2010 18:36:10 +0000 (10:36 -0800)
commitae0a37cd6bc05b5ab511d0d1a541dc57d52753e6
tree283e01c4e52e198664413234c87b2993796b3e25
parentd3334d9c444a22847e7add0f60c2e4a7243c151e
parent8837d33595b78dc4a52038856bc9a5c3f4b2ff50
Merge branch 'cm/diff-check-at-eol' into maint

* cm/diff-check-at-eol:
  diff --check: correct line numbers of new blank lines at EOF
diff.c