Mercurial > hg
comparison mercurial/treediscovery.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 | 56b2bcea2529 |
| children | 0ed11f9368fd |
comparison
equal
deleted
inserted
replaced
| 33907:1ad3085239ad | 33908:4074de97b512 |
|---|