Mercurial > hg-stable

diff mercurial/merge.py @ 3891:6b4127c7d52a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify i18n imports
author Matt Mackall <mpm@selenic.com>
date Thu, 14 Dec 2006 20:25:19 -0600
parents abaee83ce0a6
children 656e06eebda7
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Dec 14 20:23:25 2006 -0600
+++ b/mercurial/merge.py	Thu Dec 14 20:25:19 2006 -0600
@@ -6,7 +6,7 @@
 # of the GNU General Public License, incorporated herein by reference.
 
 from node import *
-from i18n import gettext as _
+from i18n import _
 import errno, util, os, tempfile
 
 def filemerge(repo, fw, fo, wctx, mctx):