summaryrefslogtreecommitdiffstats
path: root/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-07-23 00:51:59 +0000
committerJunio C Hamano <junio@kernel.org>2011-07-23 00:51:59 +0000
commit15567bc0c61c951197cb392b835678729534de57 (patch)
tree8be698fd27be92da0c23a77720987071e73b1d69 /git-mergetool--lib.txt
parent708376e8576f6d39b62b27ee9dfe7292c652f728 (diff)
downloadgit-htmldocs-15567bc0c61c951197cb392b835678729534de57.tar.gz
Autogenerated HTML docs for v1.7.6-345-g5c2f8
Diffstat (limited to 'git-mergetool--lib.txt')
-rw-r--r--git-mergetool--lib.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-mergetool--lib.txt b/git-mergetool--lib.txt
index 5b0d51f7f..f98a41b87 100644
--- a/git-mergetool--lib.txt
+++ b/git-mergetool--lib.txt
@@ -7,6 +7,7 @@ git-mergetool--lib - Common git merge tool shell scriptlets
SYNOPSIS
--------
+[verse]
'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
DESCRIPTION