D1210: error: add InMemoryMergeConflictsError

[phillco (Phil Cohen)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG795bfa2a9103: error: add InMemoryMergeConflictsError (authored by phillco, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1210?vs=3059&id=3685

REVISION DETAIL
  https://phab.mercurial-scm.org/D1210

AFFECTED FILES
  mercurial/error.py

CHANGE DETAILS

diff --git a/mercurial/error.py b/mercurial/error.py
--- a/mercurial/error.py
+++ b/mercurial/error.py
@@ -301,3 +301,7 @@
 
 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



To: phillco, martinvonz, #hg-reviewers, pulkit, durin42
Cc: mercurial-devel