summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-29 16:25:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-29 16:25:51 (GMT)
commit347231f7352a4caac8bd95924c20afde4455c89c (patch)
tree6c3fd7829891c5292f58bacbc969212d9e14c01c /Documentation/git-mergetool--lib.txt
parentf696543dad6c7ba27b0c4fab167a5687263a9ba0 (diff)
parent565e135a1e5fc393f764415a4724f43cc07f4da6 (diff)
downloadgit-347231f7352a4caac8bd95924c20afde4455c89c.zip
git-347231f7352a4caac8bd95924c20afde4455c89c.tar.gz
git-347231f7352a4caac8bd95924c20afde4455c89c.tar.bz2
Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
* jn/maint-doc-dashdash: Documentation: quote double-dash for AsciiDoc
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
-rw-r--r--Documentation/git-mergetool--lib.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt
index 63edede..5b0d51f 100644
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/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
-----------