--- a/tests/test-merge2.t Wed Oct 21 19:00:16 2020 -0700 +++ b/tests/test-merge2.t Tue Oct 06 22:36:15 2020 -0700 @@ -52,6 +52,6 @@ $ hg merge 'wdir()' abort: merging with the working copy has no effect - [255] + [10] $ cd ..