--- a/tests/test-conflict.t Thu Nov 10 09:21:41 2016 -0800
+++ b/tests/test-conflict.t Sat Nov 19 15:41:37 2016 -0800
@@ -55,7 +55,7 @@
=======
4
5
- >>>>>>> merge rev: c0c68e4fe667 - test: branch1
+ >>>>>>> merge rev: c0c68e4fe667 - test: branch1
Hop we are done.
$ hg status