Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-resolve.t
changeset 34146 9e4f82bc2b0b
parent 33097 fce4ed2912bb
child 35393 4441705b7111 
--- 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
Mercurial