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