Merge branch 'en/typofixes' into maint

Typofixes. * en/typofixes: merge-ort: fix completely wrong comment trace2.h: fix trivial comment typo

Junio C Hamano committed Oct 12, 2021 at 13:51 UTC a02d78c4aef0b2268846b8aebab1b93788e18967

No changes.