Mercurial > hg
comparison mercurial/repair.py @ 33908:4074de97b512
simplemerge: simplify code now that we always write to a context
There's no need for an `out` abstraction between files and contexts anymore.
Differential Revision: https://phab.mercurial-scm.org/D383
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Thu, 24 Aug 2017 21:30:51 -0700 |
parents | 86ea201eaeb9 |
children | 6193d810f7bb |
comparison
equal
deleted
inserted
replaced
33907:1ad3085239ad | 33908:4074de97b512 |
---|