X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=d83cd6c662847fb51641d7b8bf16739e588f67a2;hb=cc811d8d020682f0d42d5a53c282df1c1a826540;hp=5a2db296b83d1ab23bfce23913c036a71dc81398;hpb=48b303675aa238c209e527feadcbb7ba1c025c97;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 5a2db296b..d83cd6c66 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -264,7 +264,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
 
 	if (!cache_tree_fully_valid(active_cache_tree) &&
 	    cache_tree_update(active_cache_tree,
-			      active_cache, active_nr, 0, 0) < 0)
+			      active_cache, active_nr, 0, 0, 0) < 0)
 		die("error building trees");
 
 	result = lookup_tree(active_cache_tree->sha1);