Skip to content
Snippets Groups Projects
Commit ef7e667a authored by Phil Cohen's avatar Phil Cohen
Browse files

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
parent 6f754b0f
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment