phillco added inline comments.
INLINE COMMENTS
> martinvonz wrote in simplemerge.py:428
> Can this still be true? I.e., is it valid to pass None instead of one of the
> contexts?
Sent as https://phab.mercurial-scm.org/D520.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-s
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1ad3085239ad: simplemerge: make context parameters
non-optional (authored by phillco).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D382?vs=1042&id=1288
REVISIO
martinvonz added inline comments.
INLINE COMMENTS
> simplemerge.py:428
> def readctx(ctx):
> if not ctx:
> return None
Can this still be true? I.e., is it valid to pass None instead of one of the
contexts?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.me
phillco updated this revision to Diff 1042.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D382?vs=863&id=1042
REVISION DETAIL
https://phab.mercurial-scm.org/D382
AFFECTED FILES
mercurial/simplemerge.py
CHANGE DETAILS
diff --git a/mercurial/simplemer
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Also update the function docstring.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D382
AFFECTED FILES
mercurial/simplemerge.py
CH
