diff -r e3bb2a58af1e -r b4093d1d3b18 contrib/perf.py --- a/contrib/perf.py Wed Sep 25 17:57:16 2019 -0400 +++ b/contrib/perf.py Wed Sep 25 14:35:08 2019 -0700 @@ -1030,8 +1030,9 @@ def d(): # acceptremote is True because we don't want prompts in the middle of # our benchmark - merge.calculateupdates(repo, wctx, rctx, [ancestor], False, False, - acceptremote=True, followcopies=True) + merge.calculateupdates(repo, wctx, rctx, [ancestor], branchmerge=False, + force=False, acceptremote=True, + followcopies=True) timer(d) fm.end()