516 

   516 

   517     # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')

   517     # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')

   518     return util.ellipsis(mark, 80 - 8)

   518     return util.ellipsis(mark, 80 - 8)

   519 

   519 

   520 _defaultconflictmarker = ('{node|short} '

   520 _defaultconflictmarker = ('{node|short} '

   522                           '{if(bookmarks, "{bookmarks} ")}'

   523                           '{if(bookmarks, "{bookmarks} ")}'

   523                           '{ifeq(branch, "default", "", "{branch} ")}'

   524                           '{ifeq(branch, "default", "", "{branch} ")}'

   524                           '- {author|user}: {desc|firstline}')

   525                           '- {author|user}: {desc|firstline}')

   525 

   526 

   526 _defaultconflictlabels = ['local', 'other']

   527 _defaultconflictlabels = ['local', 'other']