Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-resolve.t: add some tests for .orig file contents
authorSiddharth Agarwal <sid0@fb.com>
Sun, 11 Oct 2015 23:56:44 -0700
changeset 26620 7955127efbcb
parent 26619 3b213a904b98
child 26621 36383507a6f8
test-resolve.t: add some tests for .orig file contents An upcoming patch will touch some code around this area, and I couldn't find any tests related to this.
tests/test-resolve.t file | annotate | diff | comparison | revisions 
--- 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
Mercurial