--- a/tests/test-merge-types.t Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-merge-types.t Mon May 26 11:44:58 2014 -0700
@@ -290,18 +290,18 @@
U h
$ tellmeabout a
a is a plain file with content:
- <<<<<<< local: 0139c5610547 - test: "2"
+ <<<<<<< local: 0139c5610547 - test: 2
2
=======
1
- >>>>>>> other: 97e29675e796 - test: "1"
+ >>>>>>> other: 97e29675e796 - test: 1
$ tellmeabout b
b is a plain file with content:
- <<<<<<< local: 0139c5610547 - test: "2"
+ <<<<<<< local: 0139c5610547 - test: 2
2
=======
1
- >>>>>>> other: 97e29675e796 - test: "1"
+ >>>>>>> other: 97e29675e796 - test: 1
$ tellmeabout c
c is a plain file with content:
x
@@ -345,18 +345,18 @@
[1]
$ tellmeabout a
a is a plain file with content:
- <<<<<<< local: 97e29675e796 - test: "1"
+ <<<<<<< local: 97e29675e796 - test: 1
1
=======
2
- >>>>>>> other: 0139c5610547 - test: "2"
+ >>>>>>> other: 0139c5610547 - test: 2
$ tellmeabout b
b is an executable file with content:
- <<<<<<< local: 97e29675e796 - test: "1"
+ <<<<<<< local: 97e29675e796 - test: 1
1
=======
2
- >>>>>>> other: 0139c5610547 - test: "2"
+ >>>>>>> other: 0139c5610547 - test: 2
$ tellmeabout c
c is an executable file with content:
x