--- a/tests/test-encoding-align.t Mon Dec 05 17:09:11 2011 -0600
+++ b/tests/test-encoding-align.t Thu Dec 08 14:32:44 2011 -0600
@@ -115,12 +115,15 @@
$ hg branch $S
marked working directory as branch \xe7\x9f\xad\xe5\x90\x8d (esc)
+ (branches are permanent and global, did you want a bookmark?)
$ hg tag $S
$ hg branch $M
marked working directory as branch MIDDLE_
+ (branches are permanent and global, did you want a bookmark?)
$ hg tag $M
$ hg branch $L
marked working directory as branch \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc)
+ (branches are permanent and global, did you want a bookmark?)
$ hg tag $L
check alignment of branches