Mercurial > evolve

diff tests/test-topic-stack-complex.t @ 4436:ef155f624670

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stack: make @ (current) more important than $ (some sort of unstable) Base is still ^ even if it's currently checked out.
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 10 Mar 2019 18:50:00 +0800
parents 7915aef191ff
children d70db7e455dc bcd52ce0916d
line wrap: on
line diff
--- a/tests/test-topic-stack-complex.t	Sat Mar 09 13:13:53 2019 +0800
+++ b/tests/test-topic-stack-complex.t	Sun Mar 10 18:50:00 2019 +0800
@@ -163,7 +163,7 @@
   ### target: default (branch)
   s5$ Added e and f (content divergent)
   s3^ split2 (base)
-  s4$ Added e and f (content divergent current)
+  s4@ Added e and f (content divergent current)
   s3: split2
   s2: split1
   s1: Added a and b