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