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>
Elijah Newren committed
Sep 19, 2021 at 01:48 UTC
3584cff71c62586c050505b80d7d4c9b1b290101
1 file changed
+1
-1
merge-ort.c
+1
-1
@@ -4065,7 +4065,7 @@ static int record_conflicted_index_entries(struct merge_options *opt)
4065
state.istate = index;
4066
original_cache_nr = index->cache_nr;
4067
4068
- /* Put every entry from paths into plist, then sort */
4068
+ /* Append every entry from conflicted into index, then sort */
4069
strmap_for_each_entry(&opt->priv->conflicted, &iter, e) {
4070
const char *path = e->key;
4071
struct conflict_info *ci = e->value;