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>
Jonathan Nieder committed
Mar 20, 2010 at 19:40 UTC
e44b3851c9d5fc840e8f33fb76f473a71b658d10
1 file changed
+6
merge-file.c
+6
@@ -30,6 +30,12 @@ static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our
30
int merge_status;
31
mmbuffer_t res;
32
33
+ /*
34
+ * This function is only used by cmd_merge_tree, which
35
+ * does not respect the merge.conflictstyle option.
36
+ * There is no need to worry about a label for the
37
+ * common ancestor.
38
+ */
39
merge_status = ll_merge(&res, path, base, NULL,
40
our, ".our", their, ".their", 0);
41
if (merge_status < 0)