Show More
@@ -251,7 +251,7 b' def _deletecleanfiles(repo, files):' | |||
|
251 | 251 | |
|
252 | 252 | def _writeaddedfiles(repo, pctx, files): |
|
253 | 253 | actions = merge.emptyactions() |
|
254 |
addgaction = actions[ |
|
|
254 | addgaction = actions[merge.ACTION_GET].append | |
|
255 | 255 | mf = repo['.'].manifest() |
|
256 | 256 | for f in files: |
|
257 | 257 | if not repo.wvfs.exists(f): |
General Comments 0
You need to be logged in to leave comments.
Login now