Update the help text for 'svn merge' to reflect symmetric merge.  There is more to do here, especially with the 'sync merge example' and 'reintegrate merge example' sections.
Update the help text for 'svn merge' to reflect symmetric merge.  There is
more to do here, especially with the 'sync merge example' and 'reintegrate
merge example' sections.

* subversion/svn/main.c
  (svn_cl__options): Just say 'deprecated'.
  (svn_cl__cmd_table): Update 'svn merge' text, combining sections 1 and 2.

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

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