Mercurial > hg
comparison tests/test-log-exthook.t @ 35463:ef7e667a4f7b
filemerge: only raise InMemoryMergeConflictsError when running _xmerge
The old code here was overly broad and would raise in cases when we didn't end
up calling `xmerge` and resolved using an internal tool (such as when
`premerge=True`).
Instead, let's swap out _xmerge if IMM is enabled and have the new tool raise
when called, which is the behavior we want.
Differential Revision: https://phab.mercurial-scm.org/D1739
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Wed, 20 Dec 2017 17:22:16 -0600 |
parents | bfafd189edd9 |
children | c8e2d6ed1f9e |
comparison
equal
deleted
inserted
replaced
35462:6f754b0fe54e | 35463:ef7e667a4f7b |
---|