--- 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']