Checkout
stsp
committed
on 15 May 14
* site/publish/docs/svn-merge.txt: Update to 'svn help merge' output from 1.8,
and indicate the applicable client version to readers.