[PATCH 2/2] merge-ort: fix completely wrong comment

From: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Date: Sep 19, 2021, 01:48 UTC
Message-ID: <5dd56d0c5366eaac1d235ce374358ad0f072c617.1632016135.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1093.git.git.1632016135.gitgitgadget@gmail.com>

From: Elijah Newren <newren@gmail.com>

Not sure what happened, but the comment is describing code elsewhere in the file. Fix the comment to actually discuss the code that follows.

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 merge-ort.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge-ort.c b/merge-ort.c
index 515dc39b7f6..841196cf728 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -4081,7 +4081,7 @@ static int record_conflicted_index_entries(struct merge_options *opt)
 	state.istate = index;
 	original_cache_nr = index->cache_nr;
 
-	/* Put every entry from paths into plist, then sort */
+	/* Append every entry from conflicted into index, then sort */
 	strmap_for_each_entry(&opt->priv->conflicted, &iter, e) {
 		const char *path = e->key;
 		struct conflict_info *ci = e->value;

-- 
gitgitgadget