From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Jul 2011 21:43:13 +0000 (-0700)
Subject: Merge branch 'mz/doc-synopsis-verse'
X-Git-Tag: v1.7.7-rc0~78
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b3743df73f9e0238ea360b2a640e5e5c99517e9a;p=git.git

Merge branch 'mz/doc-synopsis-verse'

* mz/doc-synopsis-verse:
  Documentation: use [verse] for SYNOPSIS sections

Conflicts:
	Documentation/git-mergetool--lib.txt
---

b3743df73f9e0238ea360b2a640e5e5c99517e9a
diff --cc Documentation/git-mergetool--lib.txt
index 5b0d51f7f,8c5be6775..f98a41b87
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@@ -7,7 -7,8 +7,8 @@@ git-mergetool--lib - Common git merge t
  
  SYNOPSIS
  --------
+ [verse]
 -'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
 +'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
  
  DESCRIPTION
  -----------