This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: make context parameters non-optional
ClosedPublic

Authored by phillco on Aug 14 2017, 2:16 AM.

Details

Summary

Also update the function docstring.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Aug 14 2017, 2:16 AM
phillco updated this revision to Diff 1042.Aug 17 2017, 2:40 PM
martinvonz added inline comments.
mercurial/simplemerge.py
428

Can this still be true? I.e., is it valid to pass None instead of one of the contexts?

This revision was automatically updated to reflect the committed changes.
phillco added inline comments.Aug 25 2017, 4:53 PM
mercurial/simplemerge.py
428

Sent as D520.