diff -r d7f3fdab94c4 -r daef13da66fe mercurial/merge.py
--- a/mercurial/merge.py	Thu Mar 29 21:15:40 2018 -0700
+++ b/mercurial/merge.py	Thu Mar 29 21:29:15 2018 -0700
@@ -561,7 +561,7 @@
         fcd = self._filectxorabsent(hash, wctx, dfile)
         fco = self._filectxorabsent(onode, octx, ofile)
         # TODO: move this to filectxorabsent
-        fca = self._repo.filectx(afile, fileid=anode, changeid=actx)
+        fca = self._repo.filectx(afile, fileid=anode, changectx=actx)
         # "premerge" x flags
         flo = fco.flags()
         fla = fca.flags()