Show More
@@ -127,8 +127,7 b" def fetch(ui, repo, source='default', **" | |||
|
127 | 127 | editor = cmdutil.commiteditor |
|
128 | 128 | if opts.get('force_editor') or opts.get('edit'): |
|
129 | 129 | editor = cmdutil.commitforceeditor |
|
130 | n = repo.commit(message, opts['user'], opts['date'], | |
|
131 | force=True, editor=editor) | |
|
130 | n = repo.commit(message, opts['user'], opts['date'], editor=editor) | |
|
132 | 131 | ui.status(_('new changeset %d:%s merges remote changes ' |
|
133 | 132 | 'with local\n') % (repo.changelog.rev(n), |
|
134 | 133 | short(n))) |
General Comments 0
You need to be logged in to leave comments.
Login now