Mercurial > hg
diff tests/test-resolve.t @ 41511:72a9aacff645
resolve: respect ui.relative-paths
Differential Revision: https://phab.mercurial-scm.org/D5748
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 29 Jan 2019 12:01:13 -0800 |
| parents | 183df3df6031 |
| children | 4764e8436b2a |
line wrap: on
line diff
--- 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)