Merge branch 'jn/web' into next

diff --git a/diff.c b/diff.c
index bc32a4aa29171af6ca268a54cde881934079de83..22b643cc2520664416ceac9998d401a6585f07bf 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -560,7 +560,7 @@ static void emit_binary_diff(mmfile_t *one, mmfile_t *two)
                else
                        line[0] = bytes - 26 + 'a' - 1;
                encode_85(line + 1, cp, bytes);
-               cp += bytes;
+               cp = (char *) cp + bytes;
                puts(line);
        }
        printf("\n");