Merge branch 'cm/diff-check-at-eol' into maint

diff --git a/diff.c b/diff.c
index b829c033534f0631dd1a40eb0e2e1097a6f10cf4..c8a7ceea02ff732f85df19d894cc5ab56ea6648e 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -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;