summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-16 21:01:28 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-16 21:33:13 -0800
commit00f8f97d30be7992c16bc466532cb591e00314bf (patch)
tree71879ad314076541471bb4ab83d13bdcf74ee02c /ll-merge.c
parent7fb0eaa289576a1dcd7751015ba791f1bce778a9 (diff)
downloadgit-00f8f97d30be7992c16bc466532cb591e00314bf.tar.gz
xdl_merge(): introduce xmparam_t for merge specific parameters
So far we have only needed to be able to pass an option that is generic to xdiff family of functions to this function. Extend the interface so that we can give it merge specific parameters. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
-rw-r--r--ll-merge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ll-merge.c b/ll-merge.c
index f4b0a07377..be2bf433a9 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -61,7 +61,7 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
mmfile_t *src2, const char *name2,
int virtual_ancestor)
{
- xpparam_t xpp;
+ xmparam_t xmp;
int style = 0;
if (buffer_is_binary(orig->ptr, orig->size) ||
@@ -76,13 +76,13 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
virtual_ancestor);
}
- memset(&xpp, 0, sizeof(xpp));
+ memset(&xmp, 0, sizeof(xmp));
if (git_xmerge_style >= 0)
style = git_xmerge_style;
return xdl_merge(orig,
src1, name1,
src2, name2,
- &xpp, XDL_MERGE_ZEALOUS | style,
+ &xmp, XDL_MERGE_ZEALOUS | style,
result);
}