Mercurial > hg
changeset 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 | ee29b0bb1619 |
| files | mercurial/commands.py tests/test-resolve.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
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()
--- 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