* subversion/include/svn_wc.h   (svn_wc_merge3): Following up on r39519 and r39520, mark as deprecated for      compatibility with 1.6, because svn_wc_merge4 is new in 1.7.
* subversion/include/svn_wc.h
  (svn_wc_merge3): Following up on r39519 and r39520, mark as deprecated for
     compatibility with 1.6, because svn_wc_merge4 is new in 1.7.

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