From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2022 00:11:38 +0000 (-0700)
Subject: Merge branch 'nb/doc-mergetool-typofix' into maint-2.38
X-Git-Tag: v2.38.2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b30a4435ed0e96212f6023cb7a952b95a58de818;p=thirdparty%2Fgit.git

Merge branch 'nb/doc-mergetool-typofix' into maint-2.38

Typofix.

* nb/doc-mergetool-typofix:
  mergetool.txt: typofix 'overwriten' -> 'overwritten'
---

b30a4435ed0e96212f6023cb7a952b95a58de818