Merge branch 'js/rebase-i-final'

diff --git a/diff.c b/diff.c
index 3c6a3e0faa58f810ce2fe8b27f62581c175edf64..4da0714cb5c4147defe9bb59685cf0f68c63bdc0 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1541,7 +1541,7 @@ static void emit_rewrite_diff(const char *name_a,
 
 struct diff_words_buffer {
        mmfile_t text;
-       long alloc;
+       unsigned long alloc;
        struct diff_words_orig {
                const char *begin, *end;
        } *orig;