Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: fix grammar of no matching files message
authorMatt Mackall <mpm@selenic.com>
Mon, 09 Jun 2014 14:11:17 -0500
changeset 21721 6539c4e9c874
parent 21720 db2392a4effc
child 21722 ee29b0bb1619
resolve: fix grammar of no matching files message
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-resolve.t file | annotate | diff | comparison | revisions 
--- 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()
--- 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
mercurial