Another follow-up to r38799:
Another follow-up to r38799:

* subversion/cmdline/update_tests.py
  (tree_conflict_uc2_schedule_re_add): This test also used --accept=mine-full
   where --accept=working is now needed.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion