Show More
@@ -143,8 +143,8 b" def fetch(ui, repo, source='default', **" | |||||
143 | ('Automated merge with %s' % |
|
143 | ('Automated merge with %s' % | |
144 | util.removeauth(other.url()))) |
|
144 | util.removeauth(other.url()))) | |
145 | editopt = opts.get('edit') or opts.get('force_editor') |
|
145 | editopt = opts.get('edit') or opts.get('force_editor') | |
146 | n = repo.commit(message, opts['user'], opts['date'], |
|
146 | editor = cmdutil.getcommiteditor(edit=editopt, editform='fetch') | |
147 | editor=cmdutil.getcommiteditor(edit=editopt)) |
|
147 | n = repo.commit(message, opts['user'], opts['date'], editor=editor) | |
148 | ui.status(_('new changeset %d:%s merges remote changes ' |
|
148 | ui.status(_('new changeset %d:%s merges remote changes ' | |
149 | 'with local\n') % (repo.changelog.rev(n), |
|
149 | 'with local\n') % (repo.changelog.rev(n), | |
150 | short(n))) |
|
150 | short(n))) |
General Comments 0
You need to be logged in to leave comments.
Login now