--- a/tests/test-rebase-inmemory.t	Thu Aug 16 16:53:48 2018 +0300
+++ b/tests/test-rebase-inmemory.t	Thu Aug 16 16:59:40 2018 +0300
@@ -177,8 +177,7 @@
   
   $ hg rebase -r . -d 2
   rebasing 4:daf7dfc139cb "a/a" (tip)
-  abort: error: 'a/a' conflicts with file 'a' in 2.
-  [255]
+  saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg
 
   $ cd ..