equal
deleted
inserted
replaced
459 $ hg rebase --continue |
459 $ hg rebase --continue |
460 rebasing 1:fdaca8533b86 "b" |
460 rebasing 1:fdaca8533b86 "b" |
461 note: rebase of 1:fdaca8533b86 created no changes to commit |
461 note: rebase of 1:fdaca8533b86 created no changes to commit |
462 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
462 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
463 $ hg resolve --list |
463 $ hg resolve --list |
464 $ test -f .hg/merge |
464 $ test -d .hg/merge |
465 [1] |
465 [1] |