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.


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

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