error: add InMemoryMergeConflictsError...
error: add InMemoryMergeConflictsError
We'll raise this exception in the merge code, and in-memory users like rebase
can catch it and retry without IMM.
Differential Revision:
https://phab.mercurial-scm.org/D1210