diff options
| -rw-r--r-- | merge-ort.c | 2 | ||||
| -rw-r--r-- | trace2.h | 2 |
2 files changed, 2 insertions, 2 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; @@ -350,7 +350,7 @@ void trace2_def_repo_fl(const char *file, int line, struct repository *repo); * being started, such as "read_recursive" or "do_read_index". * * The `repo` field, if set, will be used to get the "repo-id", so that - * recursive oerations can be attributed to the correct repository. + * recursive operations can be attributed to the correct repository. */ void trace2_region_enter_fl(const char *file, int line, const char *category, const char *label, const struct repository *repo, ...); |