Merge branch 'mw/sendemail'

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 31570b1e27af6a603df98868c627da08d91c17cc..e0b2703b380cb46b23870a97b861462d8e8f758a 100644 (file)
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -40,7 +40,7 @@ tool is available in PATH.
 +
 Instead of running one of the known merge tool programs
 'git-mergetool' can be customized to run an alternative program
-by specifying the command line to invoke in a configration
+by specifying the command line to invoke in a configuration
 variable `mergetool.<tool>.cmd`.
 +
 When 'git-mergetool' is invoked with this tool (either through the