--- a/tests/test-update-branches.t Wed Mar 04 00:45:54 2020 -0500 +++ b/tests/test-update-branches.t Fri Feb 28 11:32:02 2020 -0800 @@ -357,7 +357,6 @@ nothing changed [1] $ hg resolve -l - R a Change/delete conflict is not allowed $ hg up -qC 3