equal
deleted
inserted
replaced
544 precheck=_mergecheck, |
544 precheck=_mergecheck, |
545 ) |
545 ) |
546 def _imerge3alwaysgood(*args, **kwargs): |
546 def _imerge3alwaysgood(*args, **kwargs): |
547 # Like merge3, but record conflicts as resolved with markers in place. |
547 # Like merge3, but record conflicts as resolved with markers in place. |
548 # |
548 # |
549 # This is used for `hg diff --merge` to show the differences between |
549 # This is used for `diff.merge` to show the differences between |
550 # the auto-merge state and the committed merge state. It may be |
550 # the auto-merge state and the committed merge state. It may be |
551 # useful for other things. |
551 # useful for other things. |
552 b1, junk, b2 = _imerge3(*args, **kwargs) |
552 b1, junk, b2 = _imerge3(*args, **kwargs) |
553 # TODO is this right? I'm not sure what these return values mean, |
553 # TODO is this right? I'm not sure what these return values mean, |
554 # but as far as I can tell this will indicate to callers tha the |
554 # but as far as I can tell this will indicate to callers tha the |