* subversion/libsvn_wc/workqueue.c   (run_set_text_conflict_markers,    run_set_prop_conflict_markers): Avoid legacy api where the new api avoids      work.
* subversion/libsvn_wc/workqueue.c
  (run_set_text_conflict_markers,
   run_set_prop_conflict_markers): Avoid legacy api where the new api avoids
     work.


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

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