diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4995,7 +4995,7 @@ def resolve(ui, repo, *pats, **opts):
         ms.commit()
 
         if not didwork and pats:
-            ui.warn(_("arguments do not match paths that need resolved\n"))
+            ui.warn(_("arguments do not match paths that need resolving\n"))
 
     finally:
         wlock.release()
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -33,7 +33,7 @@ resolve -l should contain an unresolved 
 
 resolving an unknown path emits a warning
   $ hg resolve -m does-not-exist
-  arguments do not match paths that need resolved
+  arguments do not match paths that need resolving
 
 resolve the failure