Merge branch 'jc/maint-mergetool-read-fix' into maint

diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt
index 2563710b56bf441125bda6766365eb2a2b5eb46a..18f713b67a629ecbfd54e6aab1ef4fde89745d2f 100644 (file)
--- a/Documentation/git-gui.txt
+++ b/Documentation/git-gui.txt
@@ -7,6 +7,7 @@ git-gui - A portable graphical interface to Git
 
 SYNOPSIS
 --------
+[verse]
 'git gui' [<command>] [arguments]
 
 DESCRIPTION
@@ -121,14 +122,6 @@ or
 
 or browsed online at http://repo.or.cz/w/git-gui.git/[].
 
-Author
-------
-Written by Shawn O. Pearce <spearce@spearce.org>.
-
-Documentation
---------------
-Documentation by Shawn O. Pearce <spearce@spearce.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite