Mercurial > hg
changeset 26620:7955127efbcb
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.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 23:56:44 -0700 |
| parents | 3b213a904b98 |
| children | 36383507a6f8 |
| files | tests/test-resolve.t |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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