Merge branch 'en/typofixes'
commit45d141a1ddbc55c220ad4c726c02bbbf7a69247a
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Sep 2021 20:06:53 +0000 (28 13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Sep 2021 20:06:53 +0000 (28 13:06 -0700)
tree3c85529be087e76d526f849ece8d7601fb53075f
parent3d875f96f1974ccd9f5f25eede974b58aeb93b5e
parent3584cff71c62586c050505b80d7d4c9b1b290101
Merge branch 'en/typofixes'

Typofixes.

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