Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 6953:63b5f4c73c98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: mark strings for translation in Mercurial
author Martin Geisler <mg@daimi.au.dk>
date Sun, 31 Aug 2008 16:12:02 +0200
parents 11229144aa01
children 865c5be0f8df
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Aug 31 16:12:02 2008 +0200
+++ b/mercurial/merge.py	Sun Aug 31 16:12:02 2008 +0200
@@ -347,7 +347,7 @@
             updated += 1
         elif m == "dr": # divergent renames
             fl = a[2]
-            repo.ui.warn("warning: detected divergent renames of %s to:\n" % f)
+            repo.ui.warn(_("warning: detected divergent renames of %s to:\n") % f)
             for nf in fl:
                 repo.ui.warn(" %s\n" % nf)
         elif m == "e": # exec