From: Jonathan Nieder Date: Sun, 21 Mar 2010 00:40:53 +0000 (-0500) Subject: merge_file(): add comment explaining behavior wrt conflict style X-Git-Tag: v1.7.1-rc0~15^2~6 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e44b3851c9d5fc840e8f33fb76f473a71b658d10;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/merge-file.c b/merge-file.c index 07cc0c905..c336c93c0 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)