X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=xdiff%2Fxdiff.h;h=711048ea36dda1d814b395efa8bc69ab142425ca;hb=b807c524df69fb44d7fe2a68a899985a7f7e6838;hp=a71763ade835fd93ef291106298647408ada08e9;hpb=2e5b98d9064292881fb1fd7c327948c7057a490a;p=git.git

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index a71763ade..711048ea3 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -117,12 +117,14 @@ typedef struct s_xmparam {
 	int level;
 	int favor;
 	int style;
+	const char *ancestor;	/* label for orig */
+	const char *file1;	/* label for mf1 */
+	const char *file2;	/* label for mf2 */
 } xmparam_t;
 
 #define DEFAULT_CONFLICT_MARKER_SIZE 7
 
-int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
-		mmfile_t *mf2, const char *name2,
+int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
 		xmparam_t const *xmp, mmbuffer_t *result);
 
 #ifdef __cplusplus