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
branchmercurial-4.4
changeset 3995 684cc3418ecd
parent 3930 d00f0c369bc7
parent 3978 fb8e44c70798
child 4002 21eab0a99841 
--- a/tests/test-stabilize-conflict.t	Fri Aug 03 00:19:47 2018 +0200
+++ b/tests/test-stabilize-conflict.t	Tue Aug 21 13:26:35 2018 +0200
@@ -140,7 +140,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | o  changeset:   4:71c18f70c34f
+  | @  changeset:   4:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
@@ -232,7 +232,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | o  changeset:   6:1836b91c6c1d
+  | @  changeset:   6:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
evolve