merge-recursive: switch directory rename detection default

diff --git a/line-log.c b/line-log.c
index 24e21731c4315f414578b33178a7b784176bb24d..f743592bc0b6aeb2404e1f25d132dc128814bb31 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -498,7 +498,7 @@ static struct commit *check_single_commit(struct rev_info *revs)
 
 static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
 {
-       unsigned mode;
+       unsigned short mode;
        struct object_id oid;
 
        if (get_tree_entry(&commit->object.oid, spec->path, &oid, &mode))