Checkout
Julian Foad
committed
on 08 Aug 12
Update the help text for 'svn merge' to reflect symmetric merge. There is
more to do here, especially with the 'sync merge example' and 're… Show more
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. Show less