X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=6479a60cd112c5b06b354b1a251c60bb4bce972a;hb=b1d645b58ac6c96ffdc8d9a01f0b44a10deb43f9;hp=d83cd6c662847fb51641d7b8bf16739e588f67a2;hpb=3fc242f5ab8222745892047d4e481e71540425cd;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index d83cd6c66..6479a60cd 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) < 0)
+			      active_cache, active_nr, 0) < 0)
 		die("error building trees");
 
 	result = lookup_tree(active_cache_tree->sha1);