diff --git a/tests/test-resolve.t b/tests/test-resolve.t --- a/tests/test-resolve.t +++ b/tests/test-resolve.t @@ -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)