--- a/hgext/largefiles/overrides.py Sat Jul 25 01:17:35 2020 +0530
+++ b/hgext/largefiles/overrides.py Sat Jul 25 14:41:20 2020 +0530
@@ -495,6 +495,14 @@
orig(ui, repo, *pats, **opts)
+# Register the `lfmr` merge action in emptyactions() return type
+@eh.wrapfunction(merge, b'emptyactions')
+def overrideemptyactions(origfn):
+ ret = origfn()
+ ret[b'lfmr'] = []
+ return ret
+
+
# Before starting the manifest merge, merge.updates will call
# _checkunknownfile to check if there are any files in the merged-in
# changeset that collide with unknown files in the working copy.