am: suppress apply errors when using 3-way

diff --git a/Documentation/git-upload-archive.txt b/Documentation/git-upload-archive.txt
index 526e5bdd22bed5fef12c9b27dfe41011d264a3fa..bbd7617587084b0c66fd8e0b9f623cac50be2c03 100644 (file)
--- a/Documentation/git-upload-archive.txt
+++ b/Documentation/git-upload-archive.txt
@@ -16,7 +16,7 @@ Invoked by 'git-archive --remote' and sends a generated archive to the
 other end over the git protocol.
 
 This command is usually not invoked directly by the end user.  The UI
-for the protocol is on the `git-archive` side, and the program pair
+for the protocol is on the 'git-archive' side, and the program pair
 is meant to be used to get an archive from a remote repository.
 
 OPTIONS