Mercurial > hg
diff tests/test-pull-update.t @ 19798:76df01e56e7f
update: improve error message for clean non-linear update
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Mon, 23 Sep 2013 17:43:33 -0700 |
parents | f2719b387380 |
children | 216cc65cf227 |
line wrap: on
line diff
--- a/tests/test-pull-update.t Mon Sep 23 19:02:32 2013 -0700 +++ b/tests/test-pull-update.t Mon Sep 23 17:43:33 2013 -0700 @@ -25,7 +25,8 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - not updating: crosses branches (merge branches or update --check to force update) + not updating: not a linear update + (merge or update --check to force update) $ cd ../tt @@ -38,7 +39,8 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - not updating: crosses branches (merge branches or update --check to force update) + not updating: not a linear update + (merge or update --check to force update) $ HGMERGE=true hg merge merging foo