This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdb3e9f7c91aa: filemerge: pass contexts to simplemerge
(authored by phillco).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D373?vs=854=956
REVISION DETAIL
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Otherwise, this should be a no-op.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D373
AFFECTED FILES
mercurial/filemerge.py
