* subversion/svn/conflict-callbacks.c   (svn_cl__conflict_handler): Use "s" to "show all options", where     doing so both shows more options and shows help for all options.
* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler): Use "s" to "show all options", where
    doing so both shows more options and shows help for all options.

See this message and its thread for more information:

   http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=136061
   From: Blair Zajac <blair@orcaware.com>
   To: Subversion Developers <dev@subversion.tigris.org>
   Subject: Show all options for conflict resolution
   Date: Thu, 13 Mar 2008 15:59:44 -0700
   Message-ID: <47D9B1E0.7060505@orcaware.com>

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion