Merge branch 'rj/no-sign-compare' into maint

diff --git a/diff.c b/diff.c
index 85e714f6c68d24e11228b69d2511c49811c979b4..fa77b00492688c67f0cff4d7f1ac54a1868403d4 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -828,7 +828,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;