--- a/hgext/largefiles/overrides.py Thu Sep 14 13:14:32 2017 -0700
+++ b/hgext/largefiles/overrides.py Thu Sep 14 13:14:32 2017 -0700
@@ -1432,7 +1432,10 @@
lfdirstate.write()
oldstandins = lfutil.getstandinsstate(repo)
-
+ # Make sure the merge runs on disk, not in-memory. largefiles is not a
+ # good candidate for in-memory merge (large files, custom dirstate,
+ # matcher usage).
+ kwargs['wc'] = repo[None]
result = orig(repo, node, branchmerge, force, *args, **kwargs)
newstandins = lfutil.getstandinsstate(repo)