Mercurial > hg
diff contrib/check-commit @ 35105: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 |
parents | 2fb3ae89e4e1 |
children | 47084b5ffd80 |