Merge branch 'mr/vcs-svn-printf-ulong' into maint

diff --git a/diff.c b/diff.c
index 34aa855df732c4ffa35c174ea1ba2a8dc81bbfd9..cc8e81290ab67d14b1c0f63ccd6c6b2e6a0e8b0c 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1252,14 +1252,6 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
                return;
        }
 
-       if (len < 1) {
-               emit_line(o, reset, reset, line, len);
-               if (ecbdata->diff_words
-                   && ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN)
-                       fputs("~\n", o->file);
-               return;
-       }
-
        if (ecbdata->diff_words) {
                if (line[0] == '-') {
                        diff_words_append(line, len,