X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-tree.c;h=02fc10f7e622ba1c53065e7cf4563ff10af0c41f;hb=f4022fa33f1b0a63029d1bc3748f01f720151218;hp=8be0b9f910b7c2fa9506ffe5fb31bd4632eaa1a1;hpb=5803c6f8a2faf8cfbbd046d9ebd682b82bb2b086;p=git.git

diff --git a/merge-tree.c b/merge-tree.c
index 8be0b9f91..02fc10f7e 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -287,7 +287,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
  * The successful merge rules are the same as for the three-way merge
  * in git-read-tree.
  */
-static int threeway_callback(int n, unsigned long mask, struct name_entry *entry, struct traverse_info *info)
+static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *info)
 {
 	/* Same in both? */
 	if (same_entry(entry+1, entry+2)) {