# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2015-05-05 01:51:34
# Node ID 99b50346b750af631434a74611cd06c00d0f6d63
# Parent  7eb9ee3e6b148210cb84dace2cb792167238e410

merge: concatenate default conflict marker at parsing phase of .py

"+" operations are unnecessary.

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -508,11 +508,11 @@ def _formatconflictmarker(repo, ctx, tem
     # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
     return util.ellipsis(mark, 80 - 8)
 
-_defaultconflictmarker = ('{node|short} ' +
-    '{ifeq(tags, "tip", "", "{tags} ")}' +
-    '{if(bookmarks, "{bookmarks} ")}' +
-    '{ifeq(branch, "default", "", "{branch} ")}' +
-    '- {author|user}: {desc|firstline}')
+_defaultconflictmarker = ('{node|short} '
+                          '{ifeq(tags, "tip", "", "{tags} ")}'
+                          '{if(bookmarks, "{bookmarks} ")}'
+                          '{ifeq(branch, "default", "", "{branch} ")}'
+                          '- {author|user}: {desc|firstline}')
 
 _defaultconflictlabels = ['local', 'other']