--- a/tests/test-update-branches.t Mon Sep 23 17:43:33 2013 -0700
+++ b/tests/test-update-branches.t Mon Sep 23 20:07:30 2013 -0700
@@ -123,22 +123,26 @@
M sub/suba
$ revtest 'none dirty same' dirty 2 3
- abort: crosses branches (merge branches or use --clean to discard changes)
+ abort: uncommitted changes
+ (commit or update --clean to discard changes)
parent=2
M foo
$ revtest 'none dirtysub same' dirtysub 2 3
- abort: crosses branches (merge branches or use --clean to discard changes)
+ abort: uncommitted changes
+ (commit or update --clean to discard changes)
parent=2
M sub/suba
$ revtest 'none dirty cross' dirty 3 4
- abort: crosses branches (merge branches or use --clean to discard changes)
+ abort: uncommitted changes
+ (commit or update --clean to discard changes)
parent=3
M foo
$ revtest 'none dirtysub cross' dirtysub 3 4
- abort: crosses branches (merge branches or use --clean to discard changes)
+ abort: uncommitted changes
+ (commit or update --clean to discard changes)
parent=3
M sub/suba
@@ -223,5 +227,6 @@
$ hg up --quiet 0
$ hg up --quiet 2
$ hg up 5
- abort: crosses branches (merge branches or use --clean to discard changes)
+ abort: uncommitted changes
+ (commit or update --clean to discard changes)
[255]