diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-28 13:06:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-28 13:06:53 -0700 |
| commit | 45d141a1ddbc55c220ad4c726c02bbbf7a69247a (patch) | |
| tree | 3c85529be087e76d526f849ece8d7601fb53075f /merge-ort.c | |
| parent | 3d875f96f1974ccd9f5f25eede974b58aeb93b5e (diff) | |
| parent | 3584cff71c62586c050505b80d7d4c9b1b290101 (diff) | |
| download | git-45d141a1ddbc55c220ad4c726c02bbbf7a69247a.tar.gz | |
Merge branch 'en/typofixes'
Typofixes.
* en/typofixes:
merge-ort: fix completely wrong comment
trace2.h: fix trivial comment typo
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 35aa979c3a..0a76952e9b 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -4096,7 +4096,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; |