equal
deleted
inserted
replaced
370 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
370 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
371 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
371 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
372 [255] |
372 [255] |
373 $ hg resolve --all -t internal:local |
373 $ hg resolve --all -t internal:local |
374 $ hg rebase -c |
374 $ hg rebase -c |
375 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg |
375 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) |
376 $ hg tglog |
376 $ hg tglog |
377 @ 8: 'H2' |
377 @ 8: 'H2' |
378 | |
378 | |
379 o 7: 'H' |
379 o 7: 'H' |
380 | |
380 | |