changeset 24365 | f1eaf03dd608 |
parent 22676 | a014fdc97154 |
child 24368 | 55fd99a23fdc |
--- a/tests/test-fetch.t Tue Mar 17 22:47:08 2015 +0900 +++ b/tests/test-fetch.t Tue Mar 17 21:53:17 2015 +0900 @@ -339,7 +339,7 @@ marked working directory as branch topic (branches are permanent and global, did you want a bookmark?) $ hg -R n2 fetch -m merge n1 - abort: working dir not at branch tip (use "hg update" to check out branch tip) + abort: working directory not at branch tip (use "hg update" to check out branch tip) [255] parent should be 0 (fetch did not update or merge anything)