--- a/tests/test-pull-update.t Wed Nov 11 10:19:11 2015 -0800
+++ b/tests/test-pull-update.t Sun Nov 15 22:58:28 2015 +0100
@@ -25,8 +25,9 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- not updating: not a linear update
+ abort: not updating: not a linear update
(merge or update --check to force update)
+ [255]
$ cd ../tt
@@ -39,8 +40,9 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- not updating: not a linear update
+ abort: not updating: not a linear update
(merge or update --check to force update)
+ [255]
$ HGMERGE=true hg merge
merging foo