Mercurial > hg
comparison mercurial/exchange.py @ 33905:61b267a99fea
simplemerge: stop reading from, and writing to, files
We now use contexts first for everything and also pass them everywhere.
Differential Revision: https://phab.mercurial-scm.org/D380
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Thu, 24 Aug 2017 21:30:37 -0700 |
parents | 13dc7f29531e |
children | f85dfde1731a |
comparison
equal
deleted
inserted
replaced
33904:1915a5e809ca | 33905:61b267a99fea |
---|