Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Mark http-fetch without -a as deprecated
[gitweb.git]
/
Documentation
/
git-mergetool--lib.txt
diff --git
a/Documentation/git-mergetool--lib.txt
b/Documentation/git-mergetool--lib.txt
index 63ededec1d7099bb2156461895f32dcf008dedcc..8c5be6775d3d2a03518f07f90a2c336d558fdde5 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--lib"'
DESCRIPTION