Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mz/remote-rename' into maint-1.7.6
[gitweb.git]
/
Documentation
/
git-mergetool--lib.txt
diff --git
a/Documentation/git-mergetool--lib.txt
b/Documentation/git-mergetool--lib.txt
index 5b0d51f7f8cfc52739463dd90827fe5d0dc1b58c..f98a41b87c16007d6d9fa916c6a3bb31fb049216 100644
(file)
--- a/
Documentation/git-mergetool--lib.txt
+++ b/
Documentation/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