diff -r 43c00ca887d1 -r 98266b1d144d contrib/perf.py
--- a/contrib/perf.py	Mon Dec 14 18:54:03 2015 -0500
+++ b/contrib/perf.py	Mon Dec 14 20:37:41 2015 -0500
@@ -253,7 +253,7 @@
         # acceptremote is True because we don't want prompts in the middle of
         # our benchmark
         merge.calculateupdates(repo, wctx, rctx, [ancestor], False, False,
-                               False, acceptremote=True, followcopies=True)
+                               acceptremote=True, followcopies=True)
     timer(d)
     fm.end()
 
@@ -679,4 +679,3 @@
         timer, fm = gettimer(ui, opts)
         timer(fn, title=title)
         fm.end()
-