equal
deleted
inserted
replaced
119 ui.status(_('merging with %d:%s\n') % |
119 ui.status(_('merging with %d:%s\n') % |
120 (repo.changelog.rev(secondparent), short(secondparent))) |
120 (repo.changelog.rev(secondparent), short(secondparent))) |
121 err = hg.merge(repo, secondparent, remind=False) |
121 err = hg.merge(repo, secondparent, remind=False) |
122 |
122 |
123 if not err: |
123 if not err: |
|
124 # we don't translate commit messages |
124 message = (cmdutil.logmessage(opts) or |
125 message = (cmdutil.logmessage(opts) or |
125 (_('Automated merge with %s') % |
126 ('Automated merge with %s' % |
126 url.removeauth(other.url()))) |
127 url.removeauth(other.url()))) |
127 editor = cmdutil.commiteditor |
128 editor = cmdutil.commiteditor |
128 if opts.get('force_editor') or opts.get('edit'): |
129 if opts.get('force_editor') or opts.get('edit'): |
129 editor = cmdutil.commitforceeditor |
130 editor = cmdutil.commitforceeditor |
130 n = repo.commit(message, opts['user'], opts['date'], |
131 n = repo.commit(message, opts['user'], opts['date'], |