diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-29 09:25:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-29 09:25:51 -0700 |
| commit | 347231f7352a4caac8bd95924c20afde4455c89c (patch) | |
| tree | 6c3fd7829891c5292f58bacbc969212d9e14c01c /Documentation/git-mergetool--lib.txt | |
| parent | Git 1.7.6 (diff) | |
| parent | Documentation: quote double-dash for AsciiDoc (diff) | |
| download | tgif-347231f7352a4caac8bd95924c20afde4455c89c.tar.xz | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt index 63ededec1d..5b0d51f7f8 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 ----------- |