# HG changeset patch # User Valentin Gatien-Baron # Date 1535839238 14400 # Node ID 213c0493cea01a3d8f0693037e0b0e85860f2109 # Parent c54d4607e8aae0515180abf52b47a871103ae58a resolve: test that we suggest a valid hg command Differential Revision: https://phab.mercurial-scm.org/D4447 diff -r c54d4607e8aa -r 213c0493cea0 tests/test-resolve.t --- 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)