diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:51 -0800 |
| commit | 06dbc1ea5768618337bf11e5f64c4f9f14a68008 (patch) | |
| tree | 049d23a7b372994b77c192df0537b232daa10d07 /builtin-merge-file.c | |
| parent | df91d0e4d30ddc9bf2c55e3a63be9cb5318a409a (diff) | |
| parent | 8588567c96490b8d236b1bc13f9bcb0dfa118efe (diff) | |
| download | git-06dbc1ea5768618337bf11e5f64c4f9f14a68008.tar.gz | |
Merge branch 'jc/conflict-marker-size'
* jc/conflict-marker-size:
rerere: honor conflict-marker-size attribute
rerere: prepare for customizable conflict marker length
conflict-marker-size: new attribute
rerere: use ll_merge() instead of using xdl_merge()
merge-tree: use ll_merge() not xdl_merge()
xdl_merge(): allow passing down marker_size in xmparam_t
xdl_merge(): introduce xmparam_t for merge specific parameters
git_attr(): fix function signature
Conflicts:
builtin-merge-file.c
ll-merge.c
xdiff/xdiff.h
xdiff/xmerge.c
Diffstat (limited to 'builtin-merge-file.c')
| -rw-r--r-- | builtin-merge-file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-merge-file.c b/builtin-merge-file.c index 1efc4e09bc..1e70073a7e 100644 --- a/builtin-merge-file.c +++ b/builtin-merge-file.c @@ -25,7 +25,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) const char *names[3] = { NULL, NULL, NULL }; mmfile_t mmfs[3]; mmbuffer_t result = {NULL, 0}; - xpparam_t xpp = {XDF_NEED_MINIMAL}; + xmparam_t xmp = {{XDF_NEED_MINIMAL}}; int ret = 0, i = 0, to_stdout = 0; int level = XDL_MERGE_ZEALOUS_ALNUM; int style = 0, quiet = 0; @@ -73,7 +73,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) } ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2], - &xpp, XDL_MERGE_FLAGS(level, style, favor), &result); + &xmp, XDL_MERGE_FLAGS(level, style, favor), &result); for (i = 0; i < 3; i++) free(mmfs[i].ptr); |