changeset 45826 | 21733e8c924f |
parent 45771 | f90a5c211251 |
--- a/tests/test-rebase-partial.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-rebase-partial.t Wed Oct 21 19:00:16 2020 -0700 @@ -85,7 +85,7 @@ merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') - [1] + [240] $ hg rebase --abort rebase aborted $ hg tglog