--- a/mercurial/merge.py Wed Jul 18 09:46:45 2018 -0700
+++ b/mercurial/merge.py Wed Jul 18 09:49:34 2018 -0700
@@ -1637,9 +1637,12 @@
wctx[f0].remove()
progress.increment(item=f)
- # get in parallel
+ # get in parallel.
+ threadsafe = repo.ui.configbool('experimental',
+ 'worker.wdir-get-thread-safe')
prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx),
- actions[ACTION_GET])
+ actions[ACTION_GET],
+ threadsafe=threadsafe)
for i, item in prog:
progress.increment(step=i, item=item)
updated = len(actions[ACTION_GET])