# HG changeset patch
# User Phil Cohen <phillco@fb.com>
# Date 2017-11-16 05:07:30
# Node ID 795bfa2a910351efaee07b1b824048519d28faa1
# Parent  f6f8b7c8919a5aa1f711e3463f7dd9afa6b734c5

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

diff --git a/mercurial/error.py b/mercurial/error.py
--- a/mercurial/error.py
+++ b/mercurial/error.py
@@ -301,3 +301,7 @@ class CorruptedState(Exception):
 
 class PeerTransportError(Abort):
     """Transport-level I/O error when communicating with a peer repo."""
+
+class InMemoryMergeConflictsError(Exception):
+    """Exception raised when merge conflicts arose during an in-memory merge."""
+    __bytes__ = _tobytes