diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 05:01:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 05:33:13 (GMT) |
| commit | 00f8f97d30be7992c16bc466532cb591e00314bf (patch) | |
| tree | 71879ad314076541471bb4ab83d13bdcf74ee02c /xdiff/xmerge.c | |
| parent | 7fb0eaa289576a1dcd7751015ba791f1bce778a9 (diff) | |
| download | git-00f8f97d30be7992c16bc466532cb591e00314bf.zip git-00f8f97d30be7992c16bc466532cb591e00314bf.tar.gz git-00f8f97d30be7992c16bc466532cb591e00314bf.tar.bz2 | |
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 'xdiff/xmerge.c')
| -rw-r--r-- | xdiff/xmerge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c index 1cb65a9..5c37b4e 100644 --- a/xdiff/xmerge.c +++ b/xdiff/xmerge.c @@ -538,10 +538,11 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1, int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1, mmfile_t *mf2, const char *name2, - xpparam_t const *xpp, int flags, mmbuffer_t *result) { + xmparam_t const *xmp, int flags, mmbuffer_t *result) { xdchange_t *xscr1, *xscr2; xdfenv_t xe1, xe2; int status; + xpparam_t const *xpp = &xmp->xpp; result->ptr = NULL; result->size = 0; |