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