In the 'svn resolve' conflict prompt, make custom short option descriptions optional. Now we can just use the option description provided by libsvn_client in the menu, if appropriate.
In the 'svn resolve' conflict prompt, make custom short option descriptions
optional. Now we can just use the option description provided by libsvn_client
in the menu, if appropriate.

* subversion/svn/conflict-callbacks.c
  (builtin_resolver_options): Remove a custom short option description.
  (prompt_string): Show the long option description if no short one is given.


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

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