Fix an enum type mismatch in the 'svn' conflict callbacks menu table.

* subversion/svn/conflict-callbacks.c
  (text_conflict_options, prop_conflict_options, obstructed_add_options,
   tree_conflict_options, tree_conflict_options_update_moved_away):
   Don't assign a svn_cl__accept_t value to svn_wc_conflict_choice_t.
   Assign the appropriate conflict_choice_t value instead.
  (handle_text_conflict, handle_prop_conflict, handle_tree_conflict,
   handle_obstructed_add): If the "q" option was given, record 'postpone'
    as a permanent answer to future conflict prompts. This value used
    to come directly from menu data, but this meant that the conflict choice
    returned to the library was copied from the wrong type of enum.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1447398 13f79535-47bb-0310-9956-ffa450edef68