diff -r 46be5c9dac91 -r c8ba98bf0e71 mercurial/merge.py --- 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)