summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorMike Ralphson <mike@abacus.co.uk>2008-08-05 17:12:05 +0100
committerJunio C Hamano <gitster@pobox.com>2008-08-05 21:21:18 -0700
commit1168d402d2962f56cbc921bbc954d8f2179c8ba7 (patch)
tree74f6851b69153316af6706004e11c0a1a14ee757 /Documentation/git-mergetool.txt
parent04bb50f45dda9aeb755e943cbc9df264cfc8cbc5 (diff)
downloadgit-1168d402d2962f56cbc921bbc954d8f2179c8ba7.tar.gz
Documentation: typos / spelling fixes
Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
-rw-r--r--Documentation/git-mergetool.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 31570b1e27..e0b2703b38 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