Mercurial > hg

changeset 29660:99b50346b750

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: concatenate default conflict marker at parsing phase of .py "+" operations are unnecessary.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 05 May 2015 10:51:34 +0900
parents 7eb9ee3e6b14
children a181dbef8e7f
files mercurial/filemerge.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/filemerge.py	Tue Aug 02 03:54:17 2016 +0200
+++ b/mercurial/filemerge.py	Tue May 05 10:51:34 2015 +0900
@@ -508,11 +508,11 @@
     # 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']