diff -r a9abdb168425 -r 76df01e56e7f tests/test-merge5.t --- a/tests/test-merge5.t Mon Sep 23 19:02:32 2013 -0700 +++ b/tests/test-merge5.t Mon Sep 23 17:43:33 2013 -0700 @@ -14,7 +14,8 @@ $ hg update 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg update - abort: crosses branches (merge branches or update --check to force update) + abort: not a linear update + (merge or update --check to force update) [255] $ rm b $ hg update -c