changeset 45845 | 21733e8c924f |
parent 45826 | f90943d753ef |
child 45859 | 527ce85c2e60 |
--- a/tests/test-fix.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-fix.t Wed Oct 21 19:00:16 2020 -0700 @@ -869,7 +869,7 @@ merging foo.whole warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') - [1] + [240] $ hg --config extensions.rebase= fix --working-dir abort: unresolved conflicts