tests/test-topic-stack-complex.t
changeset 4435 7915aef191ff
parent 4432 5da1d162ad50
child 4436 ef155f624670
--- a/tests/test-topic-stack-complex.t	Sat Mar 09 12:54:00 2019 +0800
+++ b/tests/test-topic-stack-complex.t	Sat Mar 09 13:13:53 2019 +0800
@@ -161,9 +161,9 @@
   $ hg stack
   ### topic: foo (2 heads)
   ### target: default (branch)
-  s5: Added e and f
+  s5$ Added e and f (content divergent)
   s3^ split2 (base)
-  s4@ Added e and f (current)
+  s4$ Added e and f (content divergent current)
   s3: split2
   s2: split1
   s1: Added a and b