diff -r 24bf823377fc -r 9e4f82bc2b0b tests/test-resolve.t
--- a/tests/test-resolve.t	Tue Sep 12 19:27:01 2017 -0700
+++ b/tests/test-resolve.t	Mon Sep 11 17:49:49 2017 +0000
@@ -255,8 +255,8 @@
   warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
   [1]
   $ ls .hg/origbackups
-  file1.orig
-  file2.orig
+  file1
+  file2
   $ grep '<<<' file1 > /dev/null
   $ grep '<<<' file2 > /dev/null