Show More
@@ -503,13 +503,6 b' def simplemerge(ui, localctx, basectx, o' | |||
|
503 | 503 | # repository usually sees) might be more useful. |
|
504 | 504 | return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts) |
|
505 | 505 | |
|
506 | mode = opts.get('mode', b'merge') | |
|
507 | name_a, name_b, name_base = None, None, None | |
|
508 | if mode != b'union': | |
|
509 | name_a, name_b, name_base = _picklabels( | |
|
510 | [localctx.path(), otherctx.path(), None], opts.get('label', []) | |
|
511 | ) | |
|
512 | ||
|
513 | 506 | try: |
|
514 | 507 | localtext = readctx(localctx) |
|
515 | 508 | basetext = readctx(basectx) |
@@ -519,13 +512,18 b' def simplemerge(ui, localctx, basectx, o' | |||
|
519 | 512 | |
|
520 | 513 | m3 = Merge3Text(basetext, localtext, othertext) |
|
521 | 514 | conflicts = False |
|
515 | mode = opts.get('mode', b'merge') | |
|
522 | 516 | if mode == b'union': |
|
523 | 517 | lines = _resolve(m3, (1, 2)) |
|
524 | 518 | elif mode == b'local': |
|
525 | 519 | lines = _resolve(m3, (1,)) |
|
526 | 520 | elif mode == b'other': |
|
527 | 521 | lines = _resolve(m3, (2,)) |
|
528 | elif mode == b'mergediff': | |
|
522 | else: | |
|
523 | name_a, name_b, name_base = _picklabels( | |
|
524 | [localctx.path(), otherctx.path(), None], opts.get('label', []) | |
|
525 | ) | |
|
526 | if mode == b'mergediff': | |
|
529 | 527 | lines, conflicts = _mergediff(m3, name_a, name_b, name_base) |
|
530 | 528 | else: |
|
531 | 529 | extrakwargs = { |
General Comments 0
You need to be logged in to leave comments.
Login now