diff --git a/tests/test-merge-conflictinfo.t b/tests/test-merge-conflictinfo.t --- a/tests/test-merge-conflictinfo.t +++ b/tests/test-merge-conflictinfo.t @@ -477,8 +477,6 @@ $ hg rebase -d 2 -s 1 rebasing 1:ed93aeac6b3c "source" - transaction abort! - rollback completed abort: Not a directory: '$TESTTMP/cornercases/foo/foo/foo/foo/file/subfile' [255] $ hg resolve --tool=internal:dumpjson --all @@ -515,8 +513,6 @@ $ hg rebase -d 2 -s 1 rebasing 1:ec87889f5f90 "source" - transaction abort! - rollback completed abort: (Is a directory|Operation not permitted): '\$TESTTMP/cornercases/foo/foo/foo/foo/file' (re) [255] $ hg resolve --tool=internal:dumpjson --all diff --git a/tests/test-morestatus.t b/tests/test-morestatus.t --- a/tests/test-morestatus.t +++ b/tests/test-morestatus.t @@ -165,8 +165,6 @@ Test rebase with an interrupted update: $ hg $breakupdateflag rebase -s 2977a57ce863 -d 79361b8cdbb5 -q - transaction abort! - rollback completed $ hg status # The repository is in an unfinished *rebase* state.