diff -r 042d95beeee8 -r 18af6ebd4001 tests/test-resolve.t --- a/tests/test-resolve.t Mon Feb 09 11:02:45 2015 -0800 +++ b/tests/test-resolve.t Wed Feb 11 13:47:43 2015 +0900 @@ -43,10 +43,11 @@ U file1 U file2 -resolving an unknown path should emit a warning +resolving an unknown path should emit a warning, but not for -l $ hg resolve -m does-not-exist arguments do not match paths that need resolving + $ hg resolve -l does-not-exist resolve the failure