diff -r c54d4607e8aa -r 213c0493cea0 tests/test-resolve.t --- a/tests/test-resolve.t Sun Sep 02 08:40:57 2018 +0800 +++ b/tests/test-resolve.t Sat Sep 01 18:00:38 2018 -0400 @@ -67,6 +67,9 @@ $ hg resolve -l R file1 U file2 + $ hg resolve --re-merge filez file2 + arguments do not match paths that need resolving + (try: hg resolve --re-merge path:filez path:file2) $ hg resolve -m filez file2 arguments do not match paths that need resolving (try: hg resolve -m path:filez path:file2)