Merge branch 'pw/diff-color-moved-ws-fix'

diff --git a/merge-recursive.c b/merge-recursive.c
index ecf8db0b716ff20305425937c26ab6b8e69d33ed..59ba4b4a1a083b07050c5e6eba8306cb63736a3e 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -469,7 +469,8 @@ static void get_files_dirs(struct merge_options *o, struct tree *tree)
 {
        struct pathspec match_all;
        memset(&match_all, 0, sizeof(match_all));
-       read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
+       read_tree_recursive(the_repository, tree, "", 0, 0,
+                           &match_all, save_files_dirs, o);
 }
 
 static int get_tree_entry_if_blob(const struct object_id *tree,