Show More
@@ -717,7 +717,6 b' def overridepull(orig, ui, repo, source=' | |||||
717 | ui.debug('--update and --rebase are not compatible, ignoring ' |
|
717 | ui.debug('--update and --rebase are not compatible, ignoring ' | |
718 | 'the update flag\n') |
|
718 | 'the update flag\n') | |
719 | del opts['rebase'] |
|
719 | del opts['rebase'] | |
720 | cmdutil.bailifchanged(repo) |
|
|||
721 | origpostincoming = commands.postincoming |
|
720 | origpostincoming = commands.postincoming | |
722 | def _dummy(*args, **kwargs): |
|
721 | def _dummy(*args, **kwargs): | |
723 | pass |
|
722 | pass |
General Comments 0
You need to be logged in to leave comments.
Login now