equal
deleted
inserted
replaced
159 $ hg rebase -r . -d ec94a1ed1330~1 |
159 $ hg rebase -r . -d ec94a1ed1330~1 |
160 rebasing 9:eb3b16fef8ea "Added e and f" (tip foo) |
160 rebasing 9:eb3b16fef8ea "Added e and f" (tip foo) |
161 $ hg stack |
161 $ hg stack |
162 ### topic: foo (2 heads) |
162 ### topic: foo (2 heads) |
163 ### target: default (branch) |
163 ### target: default (branch) |
164 s5: Added e and f |
164 s5$ Added e and f (content divergent) |
165 s3^ split2 (base) |
165 s3^ split2 (base) |
166 s4@ Added e and f (current) |
166 s4$ Added e and f (content divergent current) |
167 s3: split2 |
167 s3: split2 |
168 s2: split1 |
168 s2: split1 |
169 s1: Added a and b |
169 s1: Added a and b |
170 s0^ Added foo (base) |
170 s0^ Added foo (base) |
171 |
171 |