Make libsvn_wc invoke the conflict-callback on property conflicts. (The CLI callback doesn't actually handle them yet!)
Make libsvn_wc invoke the conflict-callback on property conflicts.
(The CLI callback doesn't actually handle them yet!)

* subversion/libsvn_wc/props.c
  (maybe_generate_propconflict):  take 3 new args, invoke conflict callback.
  (apply_single_prop_add,
   apply_single_prop_delete,
   apply_single_prop_change):  take 3 new args, pass to
     maybe_generate_propconflict.
  (svn_wc__merge_props):  pass 3 new args to the apply* functions.


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

wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion