index 9038f190ece061696a3290acf8f1e9951e9d0a6c..2e6965e84b8d87f46081f8b26b9d3fa8554c4049 100644 (file)
--- a/diff.c
+++ b/diff.c
diff_words_append(line, len,
&ecbdata->diff_words->plus);
return;
diff_words_append(line, len,
&ecbdata->diff_words->plus);
return;
+ } else if (!prefixcmp(line, "\\ ")) {
+ /*
+ * Eat the "no newline at eof" marker as if we
+ * saw a "+" or "-" line with nothing on it,
+ * and return without diff_words_flush() to
+ * defer processing. If this is the end of
+ * preimage, more "+" lines may come after it.
+ */
+ return;
}
diff_words_flush(ecbdata);
if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
}
diff_words_flush(ecbdata);
if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {