equal
deleted
inserted
replaced
166 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
166 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
167 unresolved conflicts (see hg resolve, then hg rebase --continue) |
167 unresolved conflicts (see hg resolve, then hg rebase --continue) |
168 [1] |
168 [1] |
169 $ echo 'c' > c |
169 $ echo 'c' > c |
170 $ hg resolve --mark c |
170 $ hg resolve --mark c |
|
171 no unresolved files; you may continue your unfinished operation |
171 $ hg rebase --continue |
172 $ hg rebase --continue |
172 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob) |
173 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob) |
173 $ hg tglog |
174 $ hg tglog |
174 @ 4: 'C' bookmarks: Y Z |
175 @ 4: 'C' bookmarks: Y Z |
175 | |
176 | |