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

Typofix.

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

diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index 90b380970023a76799206a30789d4f8af7793991..e779a122d8a78f10adb6381a9d00e9041b2c5b70 100644 (file)
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -59,7 +59,7 @@ mergetool.hideResolved::
        possible and write the 'MERGED' file containing conflict markers around
        any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally
        represent the versions of the file from before Git's conflict
-       resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so
+       resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwritten so
        that only the unresolved conflicts are presented to the merge tool. Can
        be configured per-tool via the `mergetool.<tool>.hideResolved`
        configuration variable. Defaults to `false`.