This revision was automatically updated to reflect the committed changes.
Closed by commit rHG61b267a99fea: simplemerge: stop reading from, and writing
to, files (authored by phillco).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D380?vs=1040=1285
phillco updated this revision to Diff 1040.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D380?vs=861=1040
REVISION DETAIL
https://phab.mercurial-scm.org/D380
AFFECTED FILES
mercurial/simplemerge.py
CHANGE DETAILS
diff --git
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We now use contexts first for everything and also pass them everywhere.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D380
AFFECTED
