From 712516bcacacd45b4825ec649f15c3573f6fb42a Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 26 Aug 2010 00:49:53 -0500 Subject: ll-merge: replace flag argument with options struct Keeping track of the flag bits is proving more trouble than it's worth. Instead, use a pointer to an options struct like most similar APIs do. Callers with no special requests can pass NULL to request the default options. Cc: Bert Wesarg Cc: Avery Pennarun Helped-by: Justin Frankel Helped-by: Bert Wesarg Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- merge-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge-file.c') diff --git a/merge-file.c b/merge-file.c index db4d0d50d3..f7f4533926 100644 --- a/merge-file.c +++ b/merge-file.c @@ -37,7 +37,7 @@ static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our * common ancestor. */ merge_status = ll_merge(&res, path, base, NULL, - our, ".our", their, ".their", 0); + our, ".our", their, ".their", NULL); if (merge_status < 0) return NULL; -- cgit v1.2.1