[PATCH 06/16] merge_file(): add comment explaining behavior wrt conflict style

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mar 17, 2010, 12:05 UTC
Message-ID: <20100317120545.GF25641@progeny.tock>
In-Reply-To: <20100317113655.GA25470@progeny.tock>

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>
---

 merge-file.c |    6 ++++++
 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)

-- 
1.7.0