--- a/tests/test-rebase-conflicts.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-rebase-conflicts.t Mon Oct 12 12:44:18 2020 -0700 @@ -57,7 +57,7 @@ $ hg rebase --continue abort: no rebase in progress - [255] + [20] Conflicting rebase: