Mercurial > hg
comparison mercurial/simplemerge.py @ 35282:46d7f0713a87
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
Merge conflicts might be supported in the future, but for now are kept out of
scope.
Any places where we used to call `flushall()` should be replaced with some kind
of exception. At this point, IMM M1 is no longer supported.
Differential Revision: https://phab.mercurial-scm.org/D1212
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Fri, 01 Dec 2017 00:07:23 -0800 |
parents | 6330df9d6393 |
children | 93c4958d987c |
comparison
equal
deleted
inserted
replaced
35281:010179e21e91 | 35282:46d7f0713a87 |
---|