tests/test-evolve.t
branchstable
changeset 5353 f32d4c7f8fb7
parent 5349 e8660b28bfee
child 5359 01bcd39c432c
--- a/tests/test-evolve.t	Mon Apr 20 00:05:05 2020 +0800
+++ b/tests/test-evolve.t	Fri May 08 18:22:26 2020 +0800
@@ -412,7 +412,7 @@
   $ glog
   @  7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6:
   |
-  o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+  %  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
   |
   o  4:ba0ec09b1bab@default(public) a nifty feature
   |
@@ -757,7 +757,7 @@
 
 Test olog
 
-  $ hg olog | head -n 10 # hg touch makes the output unstable (fix it with devel option for more stable touch)
+  $ hg olog --no-origin | head -n 10 # hg touch makes the output unstable (fix it with devel option for more stable touch)
   @    d26d339c513f (12) add 4
   |\
   x |  ce341209337f (4) add 4