equal
deleted
inserted
replaced
59 |
59 |
60 eh = exthelper.exthelper() |
60 eh = exthelper.exthelper() |
61 |
61 |
62 lfstatus = lfutil.lfstatus |
62 lfstatus = lfutil.lfstatus |
63 |
63 |
64 MERGE_ACTION_LARGEFILE_MARK_REMOVED = b'lfmr' |
64 MERGE_ACTION_LARGEFILE_MARK_REMOVED = mergestatemod.MergeAction('lfmr') |
65 |
65 |
66 # -- Utility functions: commonly/repeatedly needed functionality --------------- |
66 # -- Utility functions: commonly/repeatedly needed functionality --------------- |
67 |
67 |
68 |
68 |
69 def composelargefilematcher(match, manifest): |
69 def composelargefilematcher(match, manifest): |