- memset(&xpp, 0, sizeof(xpp));
- merge_status = xdl_merge(base, our, ".our", their, ".their",
- &xpp, XDL_MERGE_ZEALOUS, &res);
-
+ /*
+ * This function is only used by cmd_merge_tree, which
+ * does not respect the merge.conflictstyle option.
+ * There is no need to worry about a label for the
+ * common ancestor.
+ */
+ merge_status = ll_merge(&res, path, base, NULL,
+ our, ".our", their, ".their", 0);