Merge branch 'jt/t5500-unflake'

[thirdparty/git.git] / ll-merge.c

diff --git a/ll-merge.c b/ll-merge.c
index d65a8971db732782822feede96e02f86d336e547..1ec0b959e015b20442aaddc417952f7a7a731d42 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -247,7 +247,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
 {
        struct ll_merge_driver *fn;
        const char *key, *name;
-       int namelen;
+       size_t namelen;
 
        if (!strcmp(var, "merge.default"))
                return git_config_string(&default_ll_merge, var, value);