# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1402341077 18000
# Node ID 6539c4e9c874e23a3ce26341cbd94627b461173e
# Parent  db2392a4effc4d1f3e6cf96970004788768ae292
resolve: fix grammar of no matching files message

diff -r db2392a4effc -r 6539c4e9c874 mercurial/commands.py
--- a/mercurial/commands.py	Mon Jun 09 13:53:23 2014 -0500
+++ b/mercurial/commands.py	Mon Jun 09 14:11:17 2014 -0500
@@ -4995,7 +4995,7 @@
         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 -r db2392a4effc -r 6539c4e9c874 tests/test-resolve.t
--- a/tests/test-resolve.t	Mon Jun 09 13:53:23 2014 -0500
+++ b/tests/test-resolve.t	Mon Jun 09 14:11:17 2014 -0500
@@ -33,7 +33,7 @@
 
 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