diff -r dffc35a5be9f -r 8a0cac20a1ad mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Sat Dec 09 14:22:12 2017 -0800
+++ b/mercurial/cmdutil.py	Mon Dec 11 09:27:40 2017 -0800
@@ -3195,7 +3195,7 @@
 
                     fctx = wctx[path]
                     flags = fctx.flags()
-                    mctx = context.memfilectx(repo,
+                    mctx = context.memfilectx(repo, ctx_,
                                               fctx.path(), fctx.data(),
                                               islink='l' in flags,
                                               isexec='x' in flags,