Show More
@@ -970,7 +970,7 b' def applyupdates(repo, actions, wctx, mc' | |||||
970 |
|
970 | |||
971 | # premerge |
|
971 | # premerge | |
972 | tocomplete = [] |
|
972 | tocomplete = [] | |
973 |
for f, args, msg in actions |
|
973 | for f, args, msg in mergeactions: | |
974 | repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg)) |
|
974 | repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg)) | |
975 | z += 1 |
|
975 | z += 1 | |
976 | progress(_updating, z, item=f, total=numupdates, unit=_files) |
|
976 | progress(_updating, z, item=f, total=numupdates, unit=_files) |
General Comments 0
You need to be logged in to leave comments.
Login now