--- 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.