Merge branch 'mz/doc-synopsis-verse'

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

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

diff --cc Documentation/git-fast-import.txt
Simple merge

diff --cc Documentation/git-mergetool--lib.txt
index 5b0d51f7f8cfc52739463dd90827fe5d0dc1b58c,8c5be6775d3d2a03518f07f90a2c336d558fdde5..f98a41b87c16007d6d9fa916c6a3bb31fb049216
--- 1/Documentation/git-mergetool--lib.txt
--- 2/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
  --------
 -'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
+ [verse]
 +'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
  
  DESCRIPTION
  -----------

diff --cc Documentation/git-revert.txt
Simple merge

diff --cc Documentation/git-sh-i18n.txt
Simple merge

diff --cc Documentation/git-status.txt
Simple merge

diff --cc Documentation/git-web--browse.txt
Simple merge