comparison hgext/patchbomb.py @ 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 71e63fe6b1ab
children 7906354cbc68
comparison
equal deleted inserted replaced
35104:f6f8b7c8919a 35105:795bfa2a9103