summaryrefslogtreecommitdiffstats
path: root/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-07-13 23:51:56 +0000
committerJunio C Hamano <junio@kernel.org>2011-07-13 23:51:56 +0000
commit360e3a1e2a1605a257fceaa3f9a5cd99ce19f0f6 (patch)
treebc06dbf2b7efe1c3cde933f43e6f92fae86e870d /git-mergetool--lib.txt
parentc652aed8923d6b63b98c910666b861a766217891 (diff)
downloadgit-htmldocs-360e3a1e2a1605a257fceaa3f9a5cd99ce19f0f6.tar.gz
Autogenerated HTML docs for v1.7.6-178-g55272
Diffstat (limited to 'git-mergetool--lib.txt')
-rw-r--r--git-mergetool--lib.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool--lib.txt b/git-mergetool--lib.txt
index 63ededec1..5b0d51f7f 100644
--- a/git-mergetool--lib.txt
+++ b/git-mergetool--lib.txt
@@ -7,7 +7,7 @@ git-mergetool--lib - Common git merge tool shell scriptlets
SYNOPSIS
--------
-'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
+'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
DESCRIPTION
-----------