From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Sep 2021 20:06:53 +0000 (-0700)
Subject: Merge branch 'en/typofixes'
X-Git-Tag: v2.34.0-rc0~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45d141a1ddbc55c220ad4c726c02bbbf7a69247a;p=thirdparty%2Fgit.git

Merge branch 'en/typofixes'

Typofixes.

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

45d141a1ddbc55c220ad4c726c02bbbf7a69247a