mergetool.txt: typofix 'overwriten' -> 'overwritten'

Signed-off-by: Noah Betzen <noah@nezteb.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index cafbbef46ae9c102e9e175e67282badb67e09255..f691afa93d6c69896a0fbab587ebcba0c1073ccc 100644 (file)
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -50,7 +50,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`.