--- a/tests/test-conflict.t Fri May 19 20:29:11 2017 -0700
+++ b/tests/test-conflict.t Tue Jun 06 22:17:39 2017 +0530
@@ -220,6 +220,7 @@
$ hg up -C
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ updated to "e0693e20f496: 123456789012345678901234567890123456789012345678901234567890????"
1 other heads for branch "default"
$ printf "\n\nEnd of file\n" >> a
$ hg ci -m "Add some stuff at the end"
@@ -258,6 +259,7 @@
$ hg up -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ updated to "18b51d585961: Add some stuff at the beginning"
1 other heads for branch "default"
$ hg merge --tool :merge-local
merging a