# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1488018962 -32400
# Node ID 458f7294dfeecf960d38eda517685b4680c39787
# Parent  5b630f2ccb4e26d079dacc300b71eb442b330b89
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.

diff -r 5b630f2ccb4e -r 458f7294dfee mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sat Feb 25 19:32:39 2017 +0900
+++ b/mercurial/filemerge.py	Sat Feb 25 19:36:02 2017 +0900
@@ -543,6 +543,7 @@
 
     ui = repo.ui
     template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker)
+    template = templater.unquotestring(template)
     tmpl = formatter.maketemplater(ui, 'conflictmarker', template)
 
     pad = max(len(l) for l in labels)
diff -r 5b630f2ccb4e -r 458f7294dfee 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