##// END OF EJS Templates
merge: concatenate default conflict marker at parsing phase of .py...
Yuya Nishihara -
r29660:99b50346 default
parent child Browse files
Show More
@@ -508,11 +508,11 b' def _formatconflictmarker(repo, ctx, tem'
508 # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
508 # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
509 return util.ellipsis(mark, 80 - 8)
509 return util.ellipsis(mark, 80 - 8)
510
510
511 _defaultconflictmarker = ('{node|short} ' +
511 _defaultconflictmarker = ('{node|short} '
512 '{ifeq(tags, "tip", "", "{tags} ")}' +
512 '{ifeq(tags, "tip", "", "{tags} ")}'
513 '{if(bookmarks, "{bookmarks} ")}' +
513 '{if(bookmarks, "{bookmarks} ")}'
514 '{ifeq(branch, "default", "", "{branch} ")}' +
514 '{ifeq(branch, "default", "", "{branch} ")}'
515 '- {author|user}: {desc|firstline}')
515 '- {author|user}: {desc|firstline}')
516
516
517 _defaultconflictlabels = ['local', 'other']
517 _defaultconflictlabels = ['local', 'other']
518
518
General Comments 0
You need to be logged in to leave comments. Login now