diff -r 052e4f1ffce9 -r 842489d18118 tests/test-update-branches.t --- a/tests/test-update-branches.t Sat Feb 25 17:08:42 2017 +0900 +++ b/tests/test-update-branches.t Mon Mar 06 23:19:57 2017 -0800 @@ -288,11 +288,8 @@ Locally removed file is allowed $ hg up -qC 3 - $ hg rm a + $ hg rm foo $ hg up -q 4 - abort: uncommitted changes - (commit or update --merge to allow merge) - [255] File conflict is not allowed $ hg up -qC 3