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

diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt
index 775024da3ed6ed50e8aa587dc31eb79f00030e84..bd0e36492fa0f7b8a8a4707c2ac7db461fcc74c8 100644 (file)
--- a/Documentation/git-update-server-info.txt
+++ b/Documentation/git-update-server-info.txt
@@ -8,6 +8,7 @@ git-update-server-info - Update auxiliary info file to help dumb servers
 
 SYNOPSIS
 --------
+[verse]
 'git update-server-info' [--force]
 
 DESCRIPTION