X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-am.txt;h=a415fe24c3dbf076145cfa44a0674875e3d2f49d;hb=50b4e0c178777a27164eb67676593255a9cbd035;hp=6645e82b84822e4310b122a8078e1ab16f4dc770;hpb=68e37f8402d5ad33b423686558265e55655a2db6;p=git.git

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 6645e82b..a415fe24 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -69,7 +69,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,