Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: test that we suggest a valid hg command
authorValentin Gatien-Baron <valentin.gatienbaron@gmail.com>
Sat, 01 Sep 2018 18:00:38 -0400
changeset 39400 213c0493cea0
parent 39399 c54d4607e8aa
child 39401 0cbcf962847e
resolve: test that we suggest a valid hg command Differential Revision: https://phab.mercurial-scm.org/D4447
tests/test-resolve.t file | annotate | diff | comparison | revisions 
--- 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)
Mercurial