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 /rerere.c | |
| parent | 7fb0eaa289576a1dcd7751015ba791f1bce778a9 (diff) | |
| download | git-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 'rerere.c')
| -rw-r--r-- | rerere.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -332,7 +332,7 @@ static int merge(const char *name, const char *path) int ret; mmfile_t cur, base, other; mmbuffer_t result = {NULL, 0}; - xpparam_t xpp = {XDF_NEED_MINIMAL}; + xmparam_t xmp = {{XDF_NEED_MINIMAL}}; if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0) return 1; @@ -342,7 +342,7 @@ static int merge(const char *name, const char *path) read_mmfile(&other, rerere_path(name, "postimage"))) return 1; ret = xdl_merge(&base, &cur, "", &other, "", - &xpp, XDL_MERGE_ZEALOUS, &result); + &xmp, XDL_MERGE_ZEALOUS, &result); if (!ret) { FILE *f = fopen(path, "w"); if (!f) |