diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-07-22 14:43:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-22 14:43:13 -0700 |
| commit | b3743df73f9e0238ea360b2a640e5e5c99517e9a (patch) | |
| tree | c3397fa071bd755b83cd6e3cf3dc100b3cccf652 /Documentation/git-mergetool--lib.txt | |
| parent | Merge branch 'jc/checkout-reflog-fix' (diff) | |
| parent | Documentation: use [verse] for SYNOPSIS sections (diff) | |
| download | tgif-b3743df73f9e0238ea360b2a640e5e5c99517e9a.tar.xz | |
Merge branch 'mz/doc-synopsis-verse'
* mz/doc-synopsis-verse:
Documentation: use [verse] for SYNOPSIS sections
Conflicts:
Documentation/git-mergetool--lib.txt
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
| -rw-r--r-- | Documentation/git-mergetool--lib.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt index 5b0d51f7f8..f98a41b87c 100644 --- 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 |