Show More
@@ -413,9 +413,11 b' def mergefiles(ui, repo, wctx, shelvectx' | |||||
413 | for file in u: |
|
413 | for file in u: | |
414 | if file in files: |
|
414 | if file in files: | |
415 | util.rename(file, file + ".orig") |
|
415 | util.rename(file, file + ".orig") | |
|
416 | ui.pushbuffer(True) | |||
416 | cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), |
|
417 | cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), | |
417 | *pathtofiles(repo, files), |
|
418 | *pathtofiles(repo, files), | |
418 | **{'no_backup': True}) |
|
419 | **{'no_backup': True}) | |
|
420 | ui.popbuffer() | |||
419 | finally: |
|
421 | finally: | |
420 | ui.quiet = oldquiet |
|
422 | ui.quiet = oldquiet | |
421 |
|
423 |
General Comments 0
You need to be logged in to leave comments.
Login now