--- a/tests/test-merge-types.t Wed Oct 05 15:28:34 2016 +0200
+++ b/tests/test-merge-types.t Fri Oct 07 08:51:50 2016 -0700
@@ -356,18 +356,18 @@
U h
$ tellmeabout a
a is a plain file with content:
- <<<<<<< local: 0139c5610547 - test: 2
+ <<<<<<< working copy: 0139c5610547 - test: 2
2
=======
1
- >>>>>>> other: 97e29675e796 - test: 1
+ >>>>>>> merge rev: 97e29675e796 - test: 1
$ tellmeabout b
b is a plain file with content:
- <<<<<<< local: 0139c5610547 - test: 2
+ <<<<<<< working copy: 0139c5610547 - test: 2
2
=======
1
- >>>>>>> other: 97e29675e796 - test: 1
+ >>>>>>> merge rev: 97e29675e796 - test: 1
$ tellmeabout c
c is a plain file with content:
x
@@ -409,18 +409,18 @@
[1]
$ tellmeabout a
a is a plain file with content:
- <<<<<<< local: 97e29675e796 - test: 1
+ <<<<<<< working copy: 97e29675e796 - test: 1
1
=======
2
- >>>>>>> other: 0139c5610547 - test: 2
+ >>>>>>> merge rev: 0139c5610547 - test: 2
$ tellmeabout b
b is an executable file with content:
- <<<<<<< local: 97e29675e796 - test: 1
+ <<<<<<< working copy: 97e29675e796 - test: 1
1
=======
2
- >>>>>>> other: 0139c5610547 - test: 2
+ >>>>>>> merge rev: 0139c5610547 - test: 2
$ tellmeabout c
c is an executable file with content:
x