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 3083 e91ca8b5ecf7
parent 3013 945a0989e41b
child 3098 87b83a3e0392
child 3115 663dbef40f97 
--- a/tests/test-stabilize-conflict.t	Thu Oct 19 18:18:43 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Oct 20 12:04:45 2017 +0200
@@ -152,7 +152,7 @@
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    amended as e04690b09bc6
+  |    obsolete:    amended 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 b20d08eea373
+  |    obsolete:    amended as 7:b20d08eea373
   |    summary:     babar count up to ten
   |
   o  changeset:   0:29ec1554cfaf
evolve