diff mercurial/commands.py @ 21721:6539c4e9c874

resolve: fix grammar of no matching files message
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Jun 2014 14:11:17 -0500
parents db2392a4effc
children 0c6cdbb697d9
line wrap: on
line diff
--- 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()