equal
deleted
inserted
replaced
452 $ hg resolve --mark a |
452 $ hg resolve --mark a |
453 (no more unresolved files) |
453 (no more unresolved files) |
454 continue: hg rebase --continue |
454 continue: hg rebase --continue |
455 $ hg rebase --continue |
455 $ hg rebase --continue |
456 rebasing 1:fdaca8533b86 "b" |
456 rebasing 1:fdaca8533b86 "b" |
457 note: rebase of 1:fdaca8533b86 created no changes to commit |
457 note: rebase of 1:fdaca8533b86 "b" created no changes to commit |
458 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
458 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
459 $ hg resolve --list |
459 $ hg resolve --list |
460 $ test -d .hg/merge |
460 $ test -d .hg/merge |
461 [1] |
461 [1] |
462 Now try again with --collapse |
462 Now try again with --collapse |