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-conflict.t
changeset 3122 c80ba40d4c87
parent 3115 663dbef40f97
child 3116 9f900937c198
child 3359 ae6fddf39933 
--- a/tests/test-stabilize-conflict.t	Fri Oct 20 15:13:28 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Oct 20 23:03:11 2017 +0200
@@ -152,7 +152,7 @@
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    amended as 5:e04690b09bc6
+  |    obsolete:    amended using amend as 5:e04690b09bc6
   |    summary:     babar count up to ten
   |
   o  changeset:   0:29ec1554cfaf
@@ -244,7 +244,7 @@
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    amended as 7:b20d08eea373
+  |    obsolete:    amended using amend as 7:b20d08eea373
   |    summary:     babar count up to ten
   |
   o  changeset:   0:29ec1554cfaf
evolve