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

diff --git a/notes.c b/notes.c
index 7f7cc4d5112cd8f5098477d03034e8c8886dcb84..ba4cae785138eec5c31e9579ef61f21045070c56 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -986,7 +986,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
                combine_notes_fn combine_notes, int flags)
 {
        struct object_id oid, object_oid;
-       unsigned mode;
+       unsigned short mode;
        struct leaf_node root_tree;
 
        if (!t)