tests/test-rebase-interruptions.t
changeset 36776 c164a3a282c1
parent 35393 4441705b7111
child 36777 66c569e57c70
equal deleted inserted replaced
36775:6dab3bdb1f00 36776:c164a3a282c1
   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]