Continue removing svn_cl__interactive_conflict_baton_t from 'svn' conflict code.
Continue removing svn_cl__interactive_conflict_baton_t from 'svn' conflict code.

Instead of passing the baton around, pass individual parameters based on
data in the baton.

* subversion/svn/conflict-callbacks.c
  (handle_tree_conflict): Add output arguments 'accept_which' and 'quit',
   and accept 'path_prefix' and 'pb' parameters instead of
   svn_cl__interactive_conflict_baton_t.
  (conflict_func_interactive): Update caller.


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

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