HomePhabricator

filemerge: only raise InMemoryMergeConflictsError when running _xmerge

Authored by phillco.

Description

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

Details

Committed
phillcoDec 20 2017, 6:22 PM
Differential Revision
D1739: filemerge: only raise InMemoryMergeConflictsError when running _xmerge
Parents
rHG6f754b0fe54e: journal: use pager
Branches
Unknown
Tags
Unknown