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

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

Junio C Hamano committed Oct 25, 2022 at 17:11 UTC b30a4435ed0e96212f6023cb7a952b95a58de818

No changes.