| changeset 19925 | 9c78ed396075 |
| parent 18935 | e5d9441ec281 |
| child 20117 | aa9385f983fa |
| 19924:c23c62209cc4 | 19925:9c78ed396075 |
|---|---|
78 $ rm A.orig |
78 $ rm A.orig |
79 $ hg resolve -m A |
79 $ hg resolve -m A |
80 $ hg rebase --continue |
80 $ hg rebase --continue |
81 |
81 |
82 $ hg tglog |
82 $ hg tglog |
83 @ 7:secret 'C' |
83 o 7:secret 'C' |
84 | |
84 | |
85 o 6:draft 'B' |
85 o 6:draft 'B' |
86 | |
86 | |
87 | o 5:draft 'F' notdefault |
87 | @ 5:draft 'F' notdefault |
88 | | |
88 | | |
89 o | 4:draft 'E' |
89 o | 4:draft 'E' |
90 | | |
90 | | |
91 o | 3:draft 'D' |
91 o | 3:draft 'D' |
92 |/ |
92 |/ |