diff -r faa49a5914bb -r 72a9aacff645 tests/test-resolve.t --- a/tests/test-resolve.t Wed Jan 30 12:05:43 2019 -0800 +++ b/tests/test-resolve.t Tue Jan 29 12:01:13 2019 -0800 @@ -67,6 +67,9 @@ $ hg resolve -l R file1 U file2 + $ hg resolve -l --config ui.relative-paths=yes + 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)