--- a/tests/test-subrepo.t Wed Feb 03 04:37:04 2016 +0000
+++ b/tests/test-subrepo.t Tue Feb 02 14:49:02 2016 +0000
@@ -664,6 +664,7 @@
$ cd ../t
$ hg up -C # discard our earlier merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 2 other heads for branch "default"
$ echo blah > t/t
$ hg ci -m13
committing subrepository t
@@ -677,6 +678,7 @@
$ hg up -C # discard changes
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 2 other heads for branch "default"
pull
@@ -718,6 +720,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 2 other heads for branch "default"
$ cat t/t
blah
@@ -1185,6 +1188,7 @@
? s/c
$ hg update -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 2 other heads for branch "default"
$ hg status -S
? s/b
? s/c