##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

narrow: use merge.ACTION_GET instead of duplicating 'g' constant...
Martin von Zweigbergk -
r41213:5838afea default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -251,7 +251,7 b' def _deletecleanfiles(repo, files):'
251
251
252 def _writeaddedfiles(repo, pctx, files):
252 def _writeaddedfiles(repo, pctx, files):
253 actions = merge.emptyactions()
253 actions = merge.emptyactions()
254 addgaction = actions['g'].append
254 addgaction = actions[merge.ACTION_GET].append
255 mf = repo['.'].manifest()
255 mf = repo['.'].manifest()
256 for f in files:
256 for f in files:
257 if not repo.wvfs.exists(f):
257 if not repo.wvfs.exists(f):
General Comments 0
You need to be logged in to leave comments. Login now