equal
deleted
inserted
replaced
441 if any( |
441 if any( |
442 stringutil.binary(input.text()) for input in (local, base, other) |
442 stringutil.binary(input.text()) for input in (local, base, other) |
443 ): |
443 ): |
444 return 1 # continue merging |
444 return 1 # continue merging |
445 merged_text, conflicts = simplemerge.simplemerge( |
445 merged_text, conflicts = simplemerge.simplemerge( |
446 ui, local, base, other, mode=mode |
446 local, base, other, mode=mode |
447 ) |
447 ) |
448 if not conflicts or premerge in validkeep: |
448 if not conflicts or premerge in validkeep: |
449 # fcd.flags() already has the merged flags (done in |
449 # fcd.flags() already has the merged flags (done in |
450 # mergestate.resolve()) |
450 # mergestate.resolve()) |
451 local.fctx.write(merged_text, local.fctx.flags()) |
451 local.fctx.write(merged_text, local.fctx.flags()) |
490 _verifytext(other, ui) |
490 _verifytext(other, ui) |
491 except error.Abort: |
491 except error.Abort: |
492 return True, True, False |
492 return True, True, False |
493 else: |
493 else: |
494 merged_text, conflicts = simplemerge.simplemerge( |
494 merged_text, conflicts = simplemerge.simplemerge( |
495 ui, local, base, other, mode=mode |
495 local, base, other, mode=mode |
496 ) |
496 ) |
497 # fcd.flags() already has the merged flags (done in |
497 # fcd.flags() already has the merged flags (done in |
498 # mergestate.resolve()) |
498 # mergestate.resolve()) |
499 local.fctx.write(merged_text, local.fctx.flags()) |
499 local.fctx.write(merged_text, local.fctx.flags()) |
500 return True, conflicts, False |
500 return True, conflicts, False |