Re: [PATCH] Re-localise conflict prompt

Please use text/* MIME type for attachments.

Mattias Engdegård wrote on Fri, Apr 12, 2013 at 22:04:57 +0200:
> + result = apr_pstrcat(pool, result,
> + _("Words in square brackets are the corresponding "
> + "--accept option arguments.\n"),
> + (char *)NULL);

The short codes ("mc", "mf", etc) are also valid as arguments to --accept.
Perhaps mention that?

eg, you could do what 'svn help' used to do:

  --changelist ARG : operate only on members of changelist ARG
                             [aliases: --cl]

(FWIW, what it does today is different:
  --changelist [--cl] ARG : operate only on members of changelist ARG
)

and then say "the option codes are also --accept argument" --- which
act as one form of documenting the "'--accept=mc' works" fact.

Makes sense?