--- a/tests/test-merge7.out
+++ b/tests/test-merge7.out
@@ -24,7 +24,7 @@ merge: warning: conflicts during merge
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9
- test.txt versions differ, resolve
+ test.txt: versions differ -> m
 merging test.txt
 resolving test.txt
 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557