From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Oct 2022 17:36:12 +0000 (-0700)
Subject: Merge branch 'nb/doc-mergetool-typofix'
X-Git-Tag: v2.39.0-rc0~115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39c1578c5e4cb39036612718ba64a683e842f316;p=thirdparty%2Fgit.git

Merge branch 'nb/doc-mergetool-typofix'

Typofix.

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

39c1578c5e4cb39036612718ba64a683e842f316