tests/test-conflict.t

--- a/tests/test-conflict.t	Sat Feb 25 19:32:39 2017 +0900
+++ b/tests/test-conflict.t	Sat Feb 25 19:36:02 2017 +0900
@@ -65,7 +65,10 @@
 Verify custom conflict markers
 
   $ hg up -q --clean .
-  $ printf "\n[ui]\nmergemarkertemplate={author} {rev}\n" >> .hg/hgrc
+  $ cat <<EOF >> .hg/hgrc
+  > [ui]
+  > mergemarkertemplate = '{author} {rev}'
+  > EOF
 
   $ hg merge 1
   merging a