summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-07-22 14:43:13 -0700
committerJunio C Hamano <gitster@pobox.com>2011-07-22 14:43:13 -0700
commitb3743df73f9e0238ea360b2a640e5e5c99517e9a (patch)
treec3397fa071bd755b83cd6e3cf3dc100b3cccf652 /Documentation/git-mergetool--lib.txt
parent4f9aba9c26d18d44e3a51b57d0e548a0cb39fcd9 (diff)
parent7791a1d9b9a4f4e15662c7c9c7f5837f461bb987 (diff)
downloadgit-b3743df73f9e0238ea360b2a640e5e5c99517e9a.tar.gz
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.txt1
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