From patchwork Tue Aug  2 13:03:20 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: merge: concatenate default conflict marker at parsing phase of .py
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 16035
Message-Id: <93655d2b1ba1268615fd.1470143000@mimosa>
To: mercurial-devel@mercurial-scm.org
Date: Tue, 02 Aug 2016 22:03:20 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1430790694 -32400
#      Tue May 05 10:51:34 2015 +0900
# Node ID 93655d2b1ba1268615fd80ff3acfa04cea6f8f14
# Parent  f6a3e181d30c8556d0188bd6d190229198fc8a01
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']