--- a/tests/test-merge7.t Thu Nov 10 09:21:41 2016 -0800
+++ b/tests/test-merge7.t Sat Nov 19 15:41:37 2016 -0800
@@ -99,7 +99,7 @@
$ cat test.txt
one
- <<<<<<< working copy: 50c3a7e29886 - test: Merge 1
+ <<<<<<< working copy: 50c3a7e29886 - test: Merge 1
two-point-five
=======
two-point-one