mercurial/error.py
changeset 35128 795bfa2a9103
parent 34258 61714510220d
child 36570 c6a7b99f150a
equal deleted inserted replaced
35127:f6f8b7c8919a 35128:795bfa2a9103
   299     """error raised when a command is not able to read its state from file"""
   299     """error raised when a command is not able to read its state from file"""
   300     __bytes__ = _tobytes
   300     __bytes__ = _tobytes
   301 
   301 
   302 class PeerTransportError(Abort):
   302 class PeerTransportError(Abort):
   303     """Transport-level I/O error when communicating with a peer repo."""
   303     """Transport-level I/O error when communicating with a peer repo."""
       
   304 
       
   305 class InMemoryMergeConflictsError(Exception):
       
   306     """Exception raised when merge conflicts arose during an in-memory merge."""
       
   307     __bytes__ = _tobytes