From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Oct 2021 20:51:35 +0000 (-0700)
Subject: Merge branch 'en/typofixes' into maint
X-Git-Tag: v2.33.1~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a02d78c4aef0b2268846b8aebab1b93788e18967;p=thirdparty%2Fgit.git

Merge branch 'en/typofixes' into maint

Typofixes.

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

a02d78c4aef0b2268846b8aebab1b93788e18967