summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-03-21 00:35:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-21 03:36:10 (GMT)
commita4b5e91c49238146f4cb85ff5f7f3bc97e0e51de (patch)
tree3870b41f8a7cd493288400d14657db961e409fe4 /ll-merge.c
parent8a161433a0b414d15093e312eb9be99587074309 (diff)
downloadgit-a4b5e91c49238146f4cb85ff5f7f3bc97e0e51de.zip
git-a4b5e91c49238146f4cb85ff5f7f3bc97e0e51de.tar.gz
git-a4b5e91c49238146f4cb85ff5f7f3bc97e0e51de.tar.bz2
xdl_merge(): move file1 and file2 labels to xmparam structure
The labels for the three participants in a potential conflict are all optional arguments for the xdiff merge routine; if they are NULL, then xdl_merge() can cope by omitting the labels from its output. Move them to the xmparam structure to allow new callers to save some keystrokes where they are not needed. This also has the virtue of making the xdiff merge interface more similar to merge_trees, which might make it easier to learn. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
-rw-r--r--ll-merge.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c
index 82c7742..184948d 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -83,7 +83,9 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
xmp.style = git_xmerge_style;
if (marker_size > 0)
xmp.marker_size = marker_size;
- return xdl_merge(orig, src1, name1, src2, name2, &xmp, result);
+ xmp.file1 = name1;
+ xmp.file2 = name2;
+ return xdl_merge(orig, src1, src2, &xmp, result);
}
static int ll_union_merge(const struct ll_merge_driver *drv_unused,