--- a/tests/test-conflict.t Mon Jun 09 03:49:07 2014 -0700
+++ b/tests/test-conflict.t Fri Jul 18 21:49:52 2014 -0500
@@ -47,13 +47,16 @@
$ 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
@@ -78,13 +81,16 @@
$ cat a
Small Mathematical Series.
+ <<<<<<< local: test 2
1
2
3
- <<<<<<< local: test 2
6
8
=======
+ 1
+ 2
+ 3
4
5
>>>>>>> other: test 1
@@ -105,13 +111,16 @@
$ cat a
Small Mathematical Series.
+ <<<<<<< local: test 2
1
2
3
- <<<<<<< local: test 2
6
8
=======
+ 1
+ 2
+ 3
4
5
>>>>>>> other: test 1
@@ -145,13 +154,16 @@
$ 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
@@ -172,13 +184,16 @@
$ cat a
Small Mathematical Series.
+ <<<<<<< local
1
2
3
- <<<<<<< local
6
8
=======
+ 1
+ 2
+ 3
4
5
>>>>>>> other