merge-recursive: switch from (oid,mode) pairs to a diff_filespec

diff --git a/sha1-name.c b/sha1-name.c
index 6dda2c16df1026e50b7d9be255b6bbfc4e92725c..d4b3d01f3c057ff9cfa404eba8653bdb4a7f5475 100644 (file)
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -1577,7 +1577,7 @@ static void diagnose_invalid_oid_path(const char *prefix,
                                      int object_name_len)
 {
        struct object_id oid;
-       unsigned mode;
+       unsigned short mode;
 
        if (!prefix)
                prefix = "";