equal
deleted
inserted
replaced
125 (_('Automated merge with %s') % |
125 (_('Automated merge with %s') % |
126 url.removeauth(other.url()))) |
126 url.removeauth(other.url()))) |
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))) |
135 |
134 |
136 finally: |
135 finally: |