X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-mergetool.txt;h=e0b2703b380cb46b23870a97b861462d8e8f758a;hb=19a31f9c1a6b18abd8a7f20d616516afca36a6a3;hp=31570b1e27af6a603df98868c627da08d91c17cc;hpb=bed625540a0e1a4ba4da9962ed53c1d83d9bf509;p=git.git

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 31570b1e2..e0b2703b3 100644
--- 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