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 3714 19ec729f3ca2
parent 3590 d5adce52cef4
parent 3702 f6979d64b9fb
child 3715 a77fb9669e99
child 3930 d00f0c369bc7 
--- a/tests/test-stabilize-conflict.t	Tue Apr 24 08:57:18 2018 +0100
+++ b/tests/test-stabilize-conflict.t	Mon Apr 23 12:11:10 2018 +0200
@@ -142,7 +142,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | *  changeset:   4:71c18f70c34f
+  | o  changeset:   4:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
@@ -236,7 +236,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | *  changeset:   6:1836b91c6c1d
+  | o  changeset:   6:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
evolve