diff -r ebee234d952a -r 527ce85c2e60 tests/test-histedit-merge-tools.t --- a/tests/test-histedit-merge-tools.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-histedit-merge-tools.t Mon Oct 12 12:44:18 2020 -0700 @@ -60,7 +60,7 @@ 7181f42b8fca: skipping changeset (no changes) $ hg histedit --abort abort: no histedit in progress - [255] + [20] $ cd .. Test legacy config name