equal
deleted
inserted
replaced
17 # s: "i hate that." |
17 # s: "i hate that." |
18 |
18 |
19 from __future__ import absolute_import |
19 from __future__ import absolute_import |
20 |
20 |
21 from .i18n import _ |
21 from .i18n import _ |
22 from .node import nullid |
22 from .node import nullrev |
23 from . import ( |
23 from . import ( |
24 error, |
24 error, |
25 mdiff, |
25 mdiff, |
26 pycompat, |
26 pycompat, |
27 util, |
27 util, |
425 |
425 |
426 |
426 |
427 def is_not_null(ctx): |
427 def is_not_null(ctx): |
428 if not util.safehasattr(ctx, "node"): |
428 if not util.safehasattr(ctx, "node"): |
429 return False |
429 return False |
430 return ctx.node() != nullid |
430 return ctx.rev() != nullrev |
431 |
431 |
432 |
432 |
433 def _mergediff(m3, name_a, name_b, name_base): |
433 def _mergediff(m3, name_a, name_b, name_base): |
434 lines = [] |
434 lines = [] |
435 conflicts = False |
435 conflicts = False |