index 6645e82b84822e4310b122a8078e1ab16f4dc770..02cabc935e854c2a8b67481588e3e4ed6b853baa 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
SYNOPSIS
--------
+[verse]
'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>...
'git-am' [--skip | --resolved]
. 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,