changeset 9183 | d0225fa2f6c4 |
parent 8894 | 868670dbc237 |
child 9188 | 4c287332e03b |
child 9196 | 07d127e771a1 |
--- a/hgext/fetch.py Tue Jul 21 12:06:32 2009 +0200 +++ b/hgext/fetch.py Wed Jul 22 22:50:34 2009 +0200 @@ -121,8 +121,9 @@ err = hg.merge(repo, secondparent, remind=False) if not err: + # we don't translate commit messages message = (cmdutil.logmessage(opts) or - (_('Automated merge with %s') % + ('Automated merge with %s' % url.removeauth(other.url()))) editor = cmdutil.commiteditor if opts.get('force_editor') or opts.get('edit'):