Follow up to r25383 with an overlooked caller upgrade:
Follow up to r25383 with an overlooked caller upgrade:

* subversion/libsvn_wc/adm_crawler.c
  (restore_file): Call svn_wc_resolved_conflict3.


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

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