[PATCH] Conflict option labels

Hi,

please find attached a patch pulling out the short descriptions
of conflict resolution options from the client and puts them into
libsvn_client.

[[
Move conflict resolution options' labels out of the client

* include/svn_client.h:
  - Provide function `svn_client_conflict_option_label`
* libsvn_client/conflicts.c:
  - Implement function `svn_client_conflict_option_label`
  - Introduce and set label field for svn_conflict_option_t
* svn/conflict-callbacks.c:
  - Split client-specific and built-in resolver options
  - Implement conversion from built-in resolvers to
    client-specific options
]]

-- 
Patrick Steinhardt, Entwickler
elego Software Solutions GmbH, http://www.elego.de
Gebäude 12 (BIG), Gustav-Meyer-Allee 25, 13355 Berlin, Germany
Sitz der Gesellschaft: Berlin, USt-IdNr.: DE 163214194
Handelsregister: Amtsgericht Charlottenburg HRB 77719
Geschäftsführer: Olaf Wagner