summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-03-21 00:40:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-21 03:36:11 (GMT)
commite44b3851c9d5fc840e8f33fb76f473a71b658d10 (patch)
treeda50f45ea04117bb754b9c526a0be7f90f9fd9e3 /merge-file.c
parentf0531a2937e919e763ab05e9800aef51658104fc (diff)
downloadgit-e44b3851c9d5fc840e8f33fb76f473a71b658d10.zip
git-e44b3851c9d5fc840e8f33fb76f473a71b658d10.tar.gz
git-e44b3851c9d5fc840e8f33fb76f473a71b658d10.tar.bz2
merge_file(): add comment explaining behavior wrt conflict style
The merge_file() function is a helper for ‘git read-tree’, which does not respect the merge.conflictstyle option, so there is no need to worry about what ancestor_name it should pass to ll_merge(). Add a comment to this effect. Signed-off-by: Jonathan Nieder <jrnieder@mgila.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
-rw-r--r--merge-file.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/merge-file.c b/merge-file.c
index 07cc0c9..c336c93 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -30,6 +30,12 @@ static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our
int merge_status;
mmbuffer_t res;
+ /*
+ * 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)