Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: remove check for null context
authorPhil Cohen <phillco@fb.com>
Fri, 25 Aug 2017 13:49:16 -0700
changeset 33932 3b2a002ef685
parent 33931 7cab956794e4
child 33933 39d253d088a9
simplemerge: remove check for null context Differential Revision: https://phab.mercurial-scm.org/D520
mercurial/simplemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/simplemerge.py	Thu Aug 24 22:20:02 2017 +0900
+++ b/mercurial/simplemerge.py	Fri Aug 25 13:49:16 2017 -0700
@@ -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.
Mercurial