mercurial/error.py

--- a/mercurial/error.py	Mon Nov 20 18:05:15 2017 -0500
+++ b/mercurial/error.py	Wed Nov 15 21:07:30 2017 -0800
@@ -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