merge-recursive: give callers of handle_content_merge() access to contents

diff --git a/archive.c b/archive.c
index 1f98324a930e39aa1a7c41e78b4fcd6450899c66..92bc001545756472069cfd9ec8430ba81822743c 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -415,7 +415,7 @@ static void parse_treeish_arg(const char **argv,
 
        if (prefix) {
                struct object_id tree_oid;
-               unsigned int mode;
+               unsigned short mode;
                int err;
 
                err = get_tree_entry(&tree->object.oid, prefix, &tree_oid,