changeset 4436 | ef155f624670 |
parent 4435 | 7915aef191ff |
child 4513 | d70db7e455dc |
child 4577 | bcd52ce0916d |
--- 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