Show More
@@ -19,7 +19,6 b'' | |||
|
19 | 19 | from __future__ import absolute_import |
|
20 | 20 | |
|
21 | 21 | from .i18n import _ |
|
22 | from .thirdparty import attr | |
|
23 | 22 | from . import ( |
|
24 | 23 | error, |
|
25 | 24 | mdiff, |
@@ -474,14 +473,14 b' def _resolve(m3, sides):' | |||
|
474 | 473 | return lines |
|
475 | 474 | |
|
476 | 475 | |
|
477 | @attr.s | |
|
478 | 476 | class MergeInput(object): |
|
479 | fctx = attr.ib() | |
|
480 | label = attr.ib(default=None) | |
|
481 | # If the "detail" part is set, then that is rendered after the label and | |
|
482 | # separated by a ':'. The label is padded to make the ':' aligned among all | |
|
483 | # merge inputs. | |
|
484 | label_detail = attr.ib(default=None) | |
|
477 | def __init__(self, fctx, label=None, label_detail=None): | |
|
478 | self.fctx = fctx | |
|
479 | self.label = label | |
|
480 | # If the "detail" part is set, then that is rendered after the label and | |
|
481 | # separated by a ':'. The label is padded to make the ':' aligned among | |
|
482 | # all merge inputs. | |
|
483 | self.label_detail = label_detail | |
|
485 | 484 | |
|
486 | 485 | |
|
487 | 486 | def simplemerge( |
General Comments 0
You need to be logged in to leave comments.
Login now