diff options
Diffstat (limited to 'merge-file.c')
| -rw-r--r-- | merge-file.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/merge-file.c b/merge-file.c index cafc274e2d..db4d0d50d3 100644 --- a/merge-file.c +++ b/merge-file.c @@ -30,7 +30,13 @@ static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our int merge_status; mmbuffer_t res; - merge_status = ll_merge(&res, path, base, + /* + * This function is only used by cmd_merge_tree, which + * does not respect the merge.conflictstyle option. + * There is no need to worry about a label for the + * common ancestor. + */ + merge_status = ll_merge(&res, path, base, NULL, our, ".our", their, ".their", 0); if (merge_status < 0) return NULL; |