diff options
Diffstat (limited to 'merge-file.c')
| -rw-r--r-- | merge-file.c | 2 |
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; |