equal
deleted
inserted
replaced
167 $ hg summary |
167 $ hg summary |
168 parent: 2:b18e25de2cf5 tip |
168 parent: 2:b18e25de2cf5 tip |
169 D |
169 D |
170 branch: default |
170 branch: default |
171 commit: 1 modified, 1 added, 1 unknown, 1 unresolved |
171 commit: 1 modified, 1 added, 1 unknown, 1 unresolved |
172 update: 1 new changesets, 2 branch heads (merge) |
172 update: (current) |
173 phases: 3 draft |
173 phases: 3 draft |
174 rebase: 0 rebased, 2 remaining (rebase --continue) |
174 rebase: 0 rebased, 2 remaining (rebase --continue) |
175 |
175 |
176 $ hg rebase --abort |
176 $ hg rebase --abort |
177 rebase aborted |
177 rebase aborted |