merge-ort: fix completely wrong comment

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-ort.c b/merge-ort.c
index 6eb910d6f0cf829f6dd028d32f89b3aa628ce12e..b346e23ff2cbeb3ea1ced62b80419af5ed613071 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -4065,7 +4065,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;