[PATCH] resolve: updated help with info about merge tools

[timeless]

On Fri, Oct 15, 2010 at 2:14 PM, Erik Zielke <ez at aragost.com> wrote:
> +        Prompts the user if the local or the other version
> +        of the files which should be used.

You don't want <if> with <prompt>. You might try <which> with <ask>.

and you can probably replace <should be used> with <to use>.