Show More
| @@ -837,9 +837,7 b' def _formatlabel(ctx, template, label, p' | |||||
| 837 |
|
837 | |||
| 838 | label = (b'%s:' % label).ljust(pad + 1) |
|
838 | label = (b'%s:' % label).ljust(pad + 1) | |
| 839 | mark = b'%s %s' % (label, templateresult) |
|
839 | mark = b'%s %s' % (label, templateresult) | |
| 840 |
|
840 | mark = mark.splitlines()[0] # split for safety | ||
| 841 | if mark: |
|
|||
| 842 | mark = mark.splitlines()[0] # split for safety |
|
|||
| 843 |
|
841 | |||
| 844 | # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') |
|
842 | # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') | |
| 845 | return stringutil.ellipsis(mark, 80 - 8) |
|
843 | return stringutil.ellipsis(mark, 80 - 8) | |
General Comments 0
You need to be logged in to leave comments.
Login now