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)
* cm/diff-check-at-eol:
  diff --check: correct line numbers of new blank lines at EOF

1  2 
diff.c

diff --cc diff.c
Simple merge