--- a/tests/test-merge-subrepos.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-merge-subrepos.t Mon Oct 12 12:44:18 2020 -0700 @@ -46,7 +46,7 @@ $ hg up --check -r '.^' abort: uncommitted changes - [255] + [20] $ hg st -S ! a $ hg up -Cq .