[PATCH 1 of 2] merge: use labels in prompts to the user

[timeless]

Simon Farnsworth wrote:
> +    prompts = partnames(labels)
> +    prompts['fd'] = fd
>      try:
>          if fco.isabsent():
>              index = ui.promptchoice(
> -                _("local changed %s which remote deleted\n"
> +                _("%(local)s changed %(fd)s which %(remote)s deleted\n"
>                    "use (c)hanged version, (d)elete, or leave (u)nresolved?"
> -                  "$$ &Changed $$ &Delete $$ &Unresolved") % fd, 2)
> +                  "$$ &Changed $$ &Delete $$ &Unresolved") % prompts, 2)

"fd" isn't really a prompt (it's the file). I understand what you're
writing and don't have a better suggestion, but in reading it, it is a
bit confusing.

(I'm going to send individual thoughts, otherwise I'll never send anything)