Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 18543:c8ba98bf0e71
merge: don't indent "local changed %s which remote deleted" prompt
It was usually not shown in a context where indentation helped readability and
it was inconsistent with other prompts.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 04 Feb 2013 02:46:53 +0100 |
| parents | 46be5c9dac91 |
| children | d0a8f09a22eb |
line wrap: on
line diff
--- 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)