Mercurial > hg > mercurial-source
diff mercurial/error.py @ 35888:795bfa2a9103
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
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Wed, 15 Nov 2017 21:07:30 -0800 (2017-11-16) |
parents | 61714510220d |
children | c6a7b99f150a |
line wrap: on
line diff
--- 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