hgext/largefiles/overrides.py
changeset 45348 490607efc992
parent 45345 e5b4061f32be
child 45375 8c466bcb0879
--- a/hgext/largefiles/overrides.py	Wed Aug 05 16:52:51 2020 +0530
+++ b/hgext/largefiles/overrides.py	Thu Aug 06 13:27:38 2020 +0530
@@ -497,14 +497,6 @@
         orig(ui, repo, *pats, **opts)
 
 
-# Register the MERGE_ACTION_LARGEFILE_MARK_REMOVED in emptyactions() return type
-@eh.wrapfunction(merge, b'emptyactions')
-def overrideemptyactions(origfn):
-    ret = origfn()
-    ret[MERGE_ACTION_LARGEFILE_MARK_REMOVED] = []
-    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.