Uppercase client-specific resolve option labels.
Uppercase client-specific resolve option labels.

* subversion/svn/conflict-callbacks.c:
  (extra_resolver_options,
   extra_resolver_options_text,
   extra_resolver_options_prop,
   extra_resolver_options_tree): upper-case labels.

Patch by: Patrick Steinhardt <patrick.steinhardt@elegosoft.com>


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1767236 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion