514 except error.Abort: |
514 except error.Abort: |
515 return 1 |
515 return 1 |
516 |
516 |
517 m3 = Merge3Text(basetext, localtext, othertext) |
517 m3 = Merge3Text(basetext, localtext, othertext) |
518 extrakwargs = { |
518 extrakwargs = { |
519 b"localorother": opts.get("localorother", None), |
519 "localorother": opts.get("localorother", None), |
520 b'minimize': True, |
520 'minimize': True, |
521 } |
521 } |
522 if mode == b'union': |
522 if mode == b'union': |
523 extrakwargs[b'start_marker'] = None |
523 extrakwargs['start_marker'] = None |
524 extrakwargs[b'mid_marker'] = None |
524 extrakwargs['mid_marker'] = None |
525 extrakwargs[b'end_marker'] = None |
525 extrakwargs['end_marker'] = None |
526 elif name_base is not None: |
526 elif name_base is not None: |
527 extrakwargs[b'base_marker'] = b'|||||||' |
527 extrakwargs['base_marker'] = b'|||||||' |
528 extrakwargs[b'name_base'] = name_base |
528 extrakwargs['name_base'] = name_base |
529 extrakwargs[b'minimize'] = False |
529 extrakwargs['minimize'] = False |
530 |
530 |
531 if mode == b'mergediff': |
531 if mode == b'mergediff': |
532 lines, conflicts = _mergediff(m3, name_a, name_b, name_base) |
532 lines, conflicts = _mergediff(m3, name_a, name_b, name_base) |
533 else: |
533 else: |
534 lines = list( |
534 lines = list( |
535 m3.merge_lines( |
535 m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs) |
536 name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs) |
|
537 ) |
|
538 ) |
536 ) |
539 conflicts = m3.conflicts and not mode == b'union' |
537 conflicts = m3.conflicts and not mode == b'union' |
540 |
538 |
541 mergedtext = b''.join(lines) |
539 mergedtext = b''.join(lines) |
542 if opts.get('print'): |
540 if opts.get('print'): |