changeset 45794 | f90a5c211251 |
parent 45251 | 3ea3b85df03f |
child 45826 | f90943d753ef |
--- a/tests/test-fix.t Thu Oct 22 23:10:06 2020 -0700 +++ b/tests/test-fix.t Tue Oct 27 15:33:15 2020 -0700 @@ -865,7 +865,7 @@ $ hg commit -Aqm "foo 2" $ hg --config extensions.rebase= rebase -r 1 -d 0 - rebasing 1:c3b6dc0e177a "foo 2" (tip) + rebasing 1:c3b6dc0e177a tip "foo 2" merging foo.whole warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')