diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-09 10:36:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-09 10:36:10 -0800 |
| commit | ae0a37cd6bc05b5ab511d0d1a541dc57d52753e6 (patch) | |
| tree | 283e01c4e52e198664413234c87b2993796b3e25 /diff.c | |
| parent | Merge branch 'tc/smart-http-post-redirect' into maint (diff) | |
| parent | diff --check: correct line numbers of new blank lines at EOF (diff) | |
| download | git-ae0a37cd6bc05b5ab511d0d1a541dc57d52753e6.tar.gz git-ae0a37cd6bc05b5ab511d0d1a541dc57d52753e6.zip | |
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
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2158,7 +2158,7 @@ static void builtin_checkdiff(const char *name_a, const char *name_b, ecbdata.ws_rule = data.ws_rule; check_blank_at_eof(&mf1, &mf2, &ecbdata); - blank_at_eof = ecbdata.blank_at_eof_in_preimage; + blank_at_eof = ecbdata.blank_at_eof_in_postimage; if (blank_at_eof) { static char *err; |
