path: root/merge-file.c
diff options
authorJonathan Nieder <>2010-08-26 05:49:53 (GMT)
committerJunio C Hamano <>2010-08-26 16:18:51 (GMT)
commit712516bcacacd45b4825ec649f15c3573f6fb42a (patch)
treed167bb0edd73ead266dad5914a2d1d49276cf4f0 /merge-file.c
parent635a7bb1d807390bedfc1147d2052e8423bcd1e0 (diff)
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 <>
Diffstat (limited to 'merge-file.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-file.c b/merge-file.c
index db4d0d5..f7f4533 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;