Merge branch 'nb/doc-mergetool-typofix'

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

Junio C Hamano committed Oct 11, 2022 at 10:36 UTC 39c1578c5e4cb39036612718ba64a683e842f316

No changes.