[PATCH 05/10] merge_file(): add comment explaining behavior wrt conflict style
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Mar 15, 2010, 07:56 UTC
- Message-ID
- <20100315075637.GE8824@progeny.tock>
- In-Reply-To
- <20100315074748.GA28827@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 its ancestor_name parameter for ll_merge(). Add a comment to this effect.
Signed-off-by: Jonathan Nieder <jrnieder@mgila.com> --- There are more non-changes (e.g., in builtin/merge-tree.c), but none of them seemed nonobvious like this one.
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