Skip to content

Commit 3584cff

Browse files
newrengitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b031f47 commit 3584cff

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

merge-ort.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4065,7 +4065,7 @@ static int record_conflicted_index_entries(struct merge_options *opt)
40654065
state.istate = index;
40664066
original_cache_nr = index->cache_nr;
40674067

4068-
/* Put every entry from paths into plist, then sort */
4068+
/* Append every entry from conflicted into index, then sort */
40694069
strmap_for_each_entry(&opt->priv->conflicted, &iter, e) {
40704070
const char *path = e->key;
40714071
struct conflict_info *ci = e->value;

0 commit comments

Comments
 (0)