# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1444633004 25200
# Node ID 7955127efbcbd70b8219544f67a588f5fc6f38f3
# Parent  3b213a904b9892b57d9d6a8dec2ea2bc33b0c1b1
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.

diff -r 3b213a904b98 -r 7955127efbcb tests/test-resolve.t
--- 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