quark added a comment.
https://bz.mercurial-scm.org/5743 bisects to this change.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D375
To: phillco, #hg-reviewers
Cc: quark, mercurial-devel
___
Mercurial-devel mailing
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb86fc43e4b73: simplemerge: write merge result to the
localctx, if passed (authored by phillco).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D375?vs=856=957
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D375
AFFECTED FILES
mercurial/simplemerge.py
CHANGE DETAILS
diff --git a/mercurial/simplemerge.py
