D520: simplemerge: remove check for null context
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Fri Aug 25 20:50:07 UTC 2017
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/D520
AFFECTED FILES
mercurial/simplemerge.py
CHANGE DETAILS
diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -425,8 +425,6 @@
The merged result is written into `localctx`.
"""
def readctx(ctx):
- if not ctx:
- return None
# Merges were always run in the working copy before, which means
# they used decoded data, if the user defined any repository
# filters.
To: phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list