Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-commit-unresolved.t
changeset 44174 75c2ca094d3a
parent 42600 3bc400ccbf99
child 45827 8d72e29ad1e0 
--- a/tests/test-commit-unresolved.t	Wed Jan 15 17:15:45 2020 -0800
+++ b/tests/test-commit-unresolved.t	Fri Jan 24 15:07:44 2020 -0800
@@ -60,7 +60,7 @@
   abort: cannot specify a node with --abort
   [255]
   $ hg merge --abort --rev e4501
-  abort: cannot specify both --rev and --abort
+  abort: cannot specify both --abort and --rev
   [255]
 
 #if abortcommand
@@ -144,7 +144,7 @@
   (branch merge, don't forget to commit)
 
   $ hg merge --preview --abort
-  abort: cannot specify --preview with --abort
+  abort: cannot specify both --abort and --preview
   [255]
 
   $ hg abort
mercurial