Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 6645e82b84822e4310b122a8078e1ab16f4dc770..02cabc935e854c2a8b67481588e3e4ed6b853baa 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -8,6 +8,7 @@ git-am - Apply a series of patches in a mailbox
 
 SYNOPSIS
 --------
+[verse]
 'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>...
 'git-am' [--skip | --resolved]
 
@@ -69,7 +70,7 @@ recover from this in one of two ways:
 
 . hand resolve the conflict in the working directory, and update
   the index file to bring it in a state that the patch should
-  have produced.  Then run the command with '--resume' option.
+  have produced.  Then run the command with '--resolved' option.
 
 The command refuses to process new mailboxes while `.dotest`
 directory exists, so if you decide to start over from scratch,