--- a/tests/test-rename-dir-merge.t Thu Nov 10 09:21:41 2016 -0800
+++ b/tests/test-rename-dir-merge.t Sat Nov 19 15:41:37 2016 -0800
@@ -148,7 +148,7 @@
target
=======
baz
- >>>>>>> merge rev: ce36d17b18fb - test: 2 add a/c
+ >>>>>>> merge rev: ce36d17b18fb - test: 2 add a/c
$ rm b/c.orig
Remote directory rename with conflicting file added in remote target directory
@@ -177,7 +177,7 @@
? a/d
? b/c.orig
$ cat b/c
- <<<<<<< working copy: ce36d17b18fb - test: 2 add a/c
+ <<<<<<< working copy: ce36d17b18fb - test: 2 add a/c
baz
=======
target