diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-16 21:01:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-16 21:33:13 -0800 |
| commit | 00f8f97d30be7992c16bc466532cb591e00314bf (patch) | |
| tree | 71879ad314076541471bb4ab83d13bdcf74ee02c /merge-file.c | |
| parent | 7fb0eaa289576a1dcd7751015ba791f1bce778a9 (diff) | |
| download | git-00f8f97d30be7992c16bc466532cb591e00314bf.tar.gz git-00f8f97d30be7992c16bc466532cb591e00314bf.tar.xz | |
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 'merge-file.c')
| -rw-r--r-- | merge-file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-file.c b/merge-file.c index 3120a95f7..5c00c7e1c 100644 --- a/merge-file.c +++ b/merge-file.c @@ -27,12 +27,12 @@ static void free_mmfile(mmfile_t *f) static void *three_way_filemerge(mmfile_t *base, mmfile_t *our, mmfile_t *their, unsigned long *size) { mmbuffer_t res; - xpparam_t xpp; + xmparam_t xmp; int merge_status; - memset(&xpp, 0, sizeof(xpp)); + memset(&xmp, 0, sizeof(xmp)); merge_status = xdl_merge(base, our, ".our", their, ".their", - &xpp, XDL_MERGE_ZEALOUS, &res); + &xmp, XDL_MERGE_ZEALOUS, &res); if (merge_status < 0) return NULL; |