xdl_merge(): move file1 and file2 labels to xmparam structure

[git.git] / ll-merge.c

diff --git a/ll-merge.c b/ll-merge.c
index 82c7742e41f4645e7d6086bb277437a84ff4f03b..184948d6015629e6b0c45e02ee792d5d6c49ef1a 100644 (file)
--- 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,