Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 6953 63b5f4c73c98
parent 6884 11229144aa01
child 7066 865c5be0f8df 
--- 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
Mercurial