diff -r a50482254b0a -r 35b3f686157a tests/test-rebase-inmemory.t --- a/tests/test-rebase-inmemory.t Thu Jul 12 22:23:51 2018 +0530 +++ b/tests/test-rebase-inmemory.t Thu Jul 12 22:35:54 2018 +0530 @@ -369,7 +369,7 @@ $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF > n > EOF - starting rebase... + starting in-memory rebase rebasing 2:177f92b77385 "c" rebasing 3:055a42cdd887 "d" rebasing 4:e860deea161a "e" @@ -400,7 +400,7 @@ $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF > y > EOF - starting rebase... + starting in-memory rebase rebasing 2:177f92b77385 "c" rebasing 3:055a42cdd887 "d" rebasing 4:e860deea161a "e" @@ -475,7 +475,7 @@ $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF > n > EOF - starting rebase... + starting in-memory rebase rebasing 4:e860deea161a "e" merging e hit a merge conflict @@ -516,7 +516,7 @@ $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF > y > EOF - starting rebase... + starting in-memory rebase rebasing 4:e860deea161a "e" merging e hit a merge conflict