mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdl_merge(): introduce xmparam_t for merge specific parameters

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2010-01-16 21:01:28 -08:00
parent 7fb0eaa289
commit 00f8f97d30
6 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ll-merge.c
View File

@ -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);
}