diff options
| author | Elijah Newren <newren@gmail.com> | 2021-09-19 04:48:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 21:25:02 +0300 |
| commit | 3584cff71c62586c050505b80d7d4c9b1b290101 (patch) | |
| tree | 02761c8b7ce89be4758c619ef8018cf05224a702 /merge-ort.c | |
| parent | b031f47802b60114d294c2075f8607ce30f50920 (diff) | |
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>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index 6eb910d6f0..b346e23ff2 100644 --- 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; |