Checkout
Stefan Sperling
committed
on 30 Jan 16
* subversion/libsvn_client/resolved.c
(conflict_get_internal): Initialize text and tree conflict resolution options
to 'unspecified' ra… Show more
* subversion/libsvn_client/resolved.c

 (conflict_get_internal): Initialize text and tree conflict resolution options

  to 'unspecified' rather than 'undefined'.

* subversion/include/svn_client.h

 (svn_client_conflict_text_get_resolution,

 (svn_client_conflict_tree_get_resolution): Update docstring accordingly.

Show less