hgext/fetch.py
changeset 9196 07d127e771a1
parent 9060 2555120b88f5
parent 9183 d0225fa2f6c4
child 9219 3f650f6aa130
--- a/hgext/fetch.py	Wed Jul 22 08:28:30 2009 +0100
+++ b/hgext/fetch.py	Wed Jul 22 22:56:45 2009 +0200
@@ -120,8 +120,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'):