D4447: resolve: test that we suggest a valid hg command

valentin.gatienbaron (Valentin Gatien-Baron) phabricator at mercurial-scm.org
Sun Sep 2 01:44:23 EDT 2018


This revision was automatically updated to reflect the committed changes.
Closed by commit rHG213c0493cea0: resolve: test that we suggest a valid hg command (authored by valentin.gatienbaron, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4447?vs=10709&id=10713

REVISION DETAIL
  https://phab.mercurial-scm.org/D4447

AFFECTED FILES
  tests/test-resolve.t

CHANGE DETAILS

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)



To: valentin.gatienbaron, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list