Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'cm/diff-check-at-eol'
[gitweb.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index c248bc64c57b3206905dd8e6f72a702073a137cc..d156ff252fda8830f75401a6b31f87c03250f775 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_p
re
image;
+ blank_at_eof = ecbdata.blank_at_eof_in_p
ost
image;
if (blank_at_eof) {
static char *err;