diff -r 5b2a2bea8cb6 -r 9c35f3a8cac4 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Thu Aug 15 15:47:15 2013 -0500
+++ b/mercurial/filemerge.py	Mon May 26 11:44:58 2014 -0700
@@ -298,7 +298,7 @@
     '{ifeq(tags, "tip", "", "{tags} ")}' +
     '{if(bookmarks, "{bookmarks} ")}' +
     '{ifeq(branch, "default", "", "{branch} ")}' +
-    '- {author|user}: "{desc|firstline}"')
+    '- {author|user}: {desc|firstline}')
 
 _defaultconflictlabels = ['local', 'other']