Make the command client use a wrapper function when calling a deprecated
function to avoid a compiler warning.

* subversion/svn/cl.h
  (svn_cl__deprecated_merge_reintegrate): New.

* subversion/svn/deprecated.c: New file.

* subversion/svn/merge-cmd.c
  (run_merge): Use wrapper.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1467247 13f79535-47bb-0310-9956-ffa450edef68