changeset 45826 | 21733e8c924f |
parent 45771 | f90a5c211251 |
child 45827 | 8d72e29ad1e0 |
--- a/tests/test-rebase-parameters.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-rebase-parameters.t Wed Oct 21 19:00:16 2020 -0700 @@ -480,7 +480,7 @@ $ hg rebase -s 2 -d 1 --tool internal:fail rebasing 2:e4e3f3546619 tip "c2b" unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') - [1] + [240] $ hg summary parent: 1:56daeba07f4b