equal
deleted
inserted
replaced
372 warning: conflicts during merge. |
372 warning: conflicts during merge. |
373 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
373 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
374 unresolved conflicts (see hg resolve, then hg rebase --continue) |
374 unresolved conflicts (see hg resolve, then hg rebase --continue) |
375 [1] |
375 [1] |
376 $ hg resolve --all -t internal:local |
376 $ hg resolve --all -t internal:local |
|
377 no unresolved files; you may continue your unfinished operation |
377 $ hg rebase -c |
378 $ hg rebase -c |
378 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) |
379 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) |
379 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
380 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
380 @ 7:draft 'H' |
381 @ 7:draft 'H' |
381 | |
382 | |