--- a/tests/test-resolve.t	Sun Oct 11 23:54:40 2015 -0700
+++ b/tests/test-resolve.t	Sun Oct 11 23:56:44 2015 -0700
@@ -139,6 +139,12 @@
   merging file2
   warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
   [1]
+  $ cat file1.orig
+  foo
+  baz
+  $ cat file2.orig
+  foo
+  baz
   $ grep '<<<' file1 > /dev/null
   $ grep '<<<' file2 > /dev/null