equal
deleted
inserted
replaced
296 |
296 |
297 _defaultconflictmarker = ('{node|short} ' + |
297 _defaultconflictmarker = ('{node|short} ' + |
298 '{ifeq(tags, "tip", "", "{tags} ")}' + |
298 '{ifeq(tags, "tip", "", "{tags} ")}' + |
299 '{if(bookmarks, "{bookmarks} ")}' + |
299 '{if(bookmarks, "{bookmarks} ")}' + |
300 '{ifeq(branch, "default", "", "{branch} ")}' + |
300 '{ifeq(branch, "default", "", "{branch} ")}' + |
301 '- {author|user}: "{desc|firstline}"') |
301 '- {author|user}: {desc|firstline}') |
302 |
302 |
303 _defaultconflictlabels = ['local', 'other'] |
303 _defaultconflictlabels = ['local', 'other'] |
304 |
304 |
305 def _formatlabels(repo, fcd, fco, labels): |
305 def _formatlabels(repo, fcd, fco, labels): |
306 """Formats the given labels using the conflict marker template. |
306 """Formats the given labels using the conflict marker template. |