equal
deleted
inserted
replaced
85 merging file |
85 merging file |
86 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
86 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
87 unresolved conflicts (see hg resolve, then hg rebase --continue) |
87 unresolved conflicts (see hg resolve, then hg rebase --continue) |
88 [1] |
88 [1] |
89 $ hg rebase --abort |
89 $ hg rebase --abort |
90 saved backup bundle to $TESTTMP/abort/.hg/strip-backup/79f6d6ab7b14-cce2340e-backup.hg |
|
91 rebase aborted |
90 rebase aborted |
92 BROKEN: C got stripped |
|
93 $ hg tglog |
91 $ hg tglog |
94 o 2: ef8c0fe0897b D |
92 o 3: 79f6d6ab7b14 C |
95 | |
93 | |
96 | o 1: 594087dbaf71 B |
94 | o 2: ef8c0fe0897b D |
|
95 | | |
|
96 o | 1: 594087dbaf71 B |
97 |/ |
97 |/ |
98 o 0: 426bada5c675 A |
98 o 0: 426bada5c675 A |
99 |
99 |
100 $ cd .. |
100 $ cd .. |
101 |
101 |