--- a/tests/test-merge-types.t Fri May 19 20:29:11 2017 -0700
+++ b/tests/test-merge-types.t Tue Jun 06 22:17:39 2017 +0530
@@ -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
+ updated to "521a1e40188f: symlink"
1 other heads for branch "default"
$ hg st
? a.orig
@@ -176,6 +177,7 @@
keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved for a? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
+ updated to "521a1e40188f: symlink"
1 other heads for branch "default"
[1]
$ hg diff --git