Mercurial > hg

diff tests/test-conflict.t @ 32047:458f7294dfee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: optionally strip quotes from merge marker template (BC) For consistency with the other template options. Quotes are necessary if you want to preserve leading/trailing whitespace, which would be stripped by config parser.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 25 Feb 2017 19:36:02 +0900
parents ce3a133f71b3
children 1b5c61d38a52
line wrap: on
line diff
--- 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