diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t index 052e4f1ffce964ffae6333aec4883ef2b4080e4f_dGVzdHMvdGVzdC11cGRhdGUtYnJhbmNoZXMudA==..842489d18118d7472bef58e00fa27b3eff8fc650_dGVzdHMvdGVzdC11cGRhdGUtYnJhbmNoZXMudA== 100644 --- a/tests/test-update-branches.t +++ b/tests/test-update-branches.t @@ -288,5 +288,5 @@ Locally removed file is allowed $ hg up -qC 3 - $ hg rm a + $ hg rm foo $ hg up -q 4 @@ -292,7 +292,4 @@ $ hg up -q 4 - abort: uncommitted changes - (commit or update --merge to allow merge) - [255] File conflict is not allowed $ hg up -qC 3