changeset 45826 | 21733e8c924f |
parent 35393 | 4441705b7111 |
child 45840 | 527ce85c2e60 |
--- a/tests/test-rebase-pull.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-rebase-pull.t Wed Oct 21 19:00:16 2020 -0700 @@ -90,7 +90,7 @@ > EOF Editing (d80cc2da061e), you may commit or record as needed now. (hg histedit --continue to resume) - [1] + [240] $ hg pull --rebase abort: histedit in progress (use 'hg histedit --continue' or 'hg histedit --abort')