Mercurial Mercurial > pub > hg > evolve / 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-stabilize-result.t
branchmercurial-3.9
changeset 2801 49494d0155b7
parent 2597 22c05418ca71
parent 2776 4dd84054ebbb
child 3004 a456f55b3a6b 
--- a/tests/test-stabilize-result.t	Tue Jul 25 04:00:17 2017 +0200
+++ b/tests/test-stabilize-result.t	Tue Jul 25 04:01:10 2017 +0200
@@ -97,7 +97,7 @@
   +newer a
   $ hg evolve --continue
   grafting 5:3655f0f50885 "newer a"
-  abort: unresolved merge conflicts (see 'hg help resolve')
+  abort: unresolved merge conflicts (see "hg help resolve")
   [255]
   $ hg resolve -m a
   (no more unresolved files)
evolve