Mercurial > public > mercurial-scm > hg

diff hgext/fetch.py @ 9188:4c287332e03b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Matt Mackall <mpm@selenic.com>
date Wed, 22 Jul 2009 18:08:02 -0500
parents d9a2e6327949 d0225fa2f6c4
children 3f650f6aa130
line wrap: on
line diff
--- a/hgext/fetch.py	Wed Jul 22 17:59:11 2009 -0500
+++ b/hgext/fetch.py	Wed Jul 22 18:08:02 2009 -0500
@@ -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'):