changeset 48711 | 9bc86adf32f6 |
parent 48709 | d536d4afe003 |
child 48875 | 6000f5b25c9b |
--- a/hgext/largefiles/overrides.py Fri Jan 28 16:25:41 2022 +0100 +++ b/hgext/largefiles/overrides.py Fri Jan 28 17:08:30 2022 +0100 @@ -61,7 +61,7 @@ lfstatus = lfutil.lfstatus -MERGE_ACTION_LARGEFILE_MARK_REMOVED = b'lfmr' +MERGE_ACTION_LARGEFILE_MARK_REMOVED = mergestatemod.MergeAction('lfmr') # -- Utility functions: commonly/repeatedly needed functionality ---------------