--- a/tests/failfilemerge.py	Mon Sep 11 18:07:29 2017 +0200
+++ b/tests/failfilemerge.py	Mon Sep 11 13:03:27 2017 -0700
@@ -9,7 +9,8 @@
 )
 
 def failfilemerge(filemergefn,
-                  premerge, repo, mynode, orig, fcd, fco, fca, labels=None):
+                  premerge, repo, wctx, mynode, orig, fcd, fco, fca,
+                  labels=None):
     raise error.Abort("^C")
     return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)