--- a/tests/test-conflict.out
+++ b/tests/test-conflict.out
@@ -12,15 +12,15 @@
 + hg -d up -m 1
 merge: warning: conflicts during merge
 resolving manifests
- ancestor 1c6e5a12 local 35fedfab remote a5801785
+ ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
  a versions differ, resolve
 working dir created .out, keeping
 merging a
 resolving a
-file a: other d7250518 ancestor 68ba9db7
+file a: other d7250518cb1b ancestor 68ba9db7a9e4
 merging a failed!
 + hg id
-32e80765+75234512+ tip
+32e80765d7fe+75234512624c+ tip
 + cat a
 + grep -v '>>>'
 + grep -v '<<<'