Mercurial Mercurial > mercurial / 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 18543 c8ba98bf0e71
parent 18542 46be5c9dac91
child 18544 d0a8f09a22eb 
--- a/mercurial/merge.py	Mon Feb 04 02:46:38 2013 +0100
+++ b/mercurial/merge.py	Mon Feb 04 02:46:53 2013 +0100
@@ -298,7 +298,7 @@
     for f, m in sorted(prompts):
         if m == "cd":
             if repo.ui.promptchoice(
-                _(" local changed %s which remote deleted\n"
+                _("local changed %s which remote deleted\n"
                   "use (c)hanged version or (d)elete?") % f,
                 (_("&Changed"), _("&Delete")), 0):
                 act("prompt delete", "r", f)
mercurial