--- a/tests/test-conflict.t Wed Feb 10 08:25:03 2016 -0800
+++ b/tests/test-conflict.t Wed Feb 10 09:06:08 2016 -0800
@@ -46,16 +46,13 @@
$ cat a
Small Mathematical Series.
- <<<<<<< local: 618808747361 - test: branch2
1
2
3
+ <<<<<<< local: 618808747361 - test: branch2
6
8
=======
- 1
- 2
- 3
4
5
>>>>>>> other: c0c68e4fe667 - test: branch1
@@ -79,16 +76,13 @@
$ cat a
Small Mathematical Series.
- <<<<<<< local: test 2
1
2
3
+ <<<<<<< local: test 2
6
8
=======
- 1
- 2
- 3
4
5
>>>>>>> other: test 1
@@ -108,16 +102,13 @@
$ cat a
Small Mathematical Series.
- <<<<<<< local: test 2
1
2
3
+ <<<<<<< local: test 2
6
8
=======
- 1
- 2
- 3
4
5
>>>>>>> other: test 1
@@ -150,16 +141,13 @@
$ cat a
Small Mathematical Series.
- <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc)
1
2
3
+ <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc)
6
8
=======
- 1
- 2
- 3
4
5
>>>>>>> other: branch1
@@ -179,16 +167,13 @@
$ cat a
Small Mathematical Series.
- <<<<<<< local
1
2
3
+ <<<<<<< local
6
8
=======
- 1
- 2
- 3
4
5
>>>>>>> other