Mercurial > hg-stable
diff tests/test-resolve.t @ 39427:213c0493cea0
resolve: test that we suggest a valid hg command
Differential Revision: https://phab.mercurial-scm.org/D4447
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Sat, 01 Sep 2018 18:00:38 -0400 |
| parents | 56469d475341 |
| children | f07ab9ddc0c0 |
line wrap: on
line diff
--- 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)