Merge branch 'en/typofixes'

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

Junio C Hamano committed Sep 28, 2021 at 13:06 UTC 45d141a1ddbc55c220ad4c726c02bbbf7a69247a

No changes.