Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/maint-estimate-cache-size' into maint
[gitweb.git]
/
Documentation
/
git-mergetool--lib.txt
diff --git
a/Documentation/git-mergetool--lib.txt
b/Documentation/git-mergetool--lib.txt
index 8c5be6775d3d2a03518f07f90a2c336d558fdde5..f98a41b87c16007d6d9fa916c6a3bb31fb049216 100644
(file)
--- a/
Documentation/git-mergetool--lib.txt
+++ b/
Documentation/git-mergetool--lib.txt
@@
-8,7
+8,7
@@
git-mergetool--lib - Common git merge tool shell scriptlets
SYNOPSIS
--------
[verse]
-'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool
--
lib"'
+'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool
{litdd}
lib"'
DESCRIPTION
-----------