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
changeset 3385 823031b51d81
parent 3374 612b3bd31499
child 3410 39112fd4d5ed 
--- a/tests/test-stabilize-result.t	Tue Jan 09 23:42:57 2018 +0530
+++ b/tests/test-stabilize-result.t	Sat Jan 06 18:48:15 2018 +0530
@@ -93,13 +93,13 @@
   +a
   +newer a
   $ hg evolve --continue
-  grafting 4:3655f0f50885 "newer a"
+  evolving 4:3655f0f50885 "newer a"
   abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
   $ hg resolve -m a
   (no more unresolved files)
   $ hg evolve --continue
-  grafting 4:3655f0f50885 "newer a"
+  evolving 4:3655f0f50885 "newer a"
 
 Stabilize latecomer with different parent
 =========================================
evolve