--- a/tests/test-merge-types.t Wed Feb 03 04:37:04 2016 +0000
+++ b/tests/test-merge-types.t Tue Feb 02 14:49:02 2016 +0000
@@ -155,6 +155,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1 other heads for branch "default"
$ hg st
? a.orig
@@ -175,6 +176,7 @@
keep (l)ocal, take (o)ther, or leave (u)nresolved? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
+ 1 other heads for branch "default"
[1]
$ hg diff --git
diff --git a/a b/a