* www/merge-tracking/requirements.html   (cherry-picking): Reword section to reduce overlap with the    manual-merge section.   (manual-merge): Improve description.  Remove tenuously-related quote    about svnmerge.py's meta data which could result in confusion for    those not familiar with both systems.
* www/merge-tracking/requirements.html
  (cherry-picking): Reword section to reduce overlap with the
   manual-merge section.
  (manual-merge): Improve description.  Remove tenuously-related quote
   about svnmerge.py's meta data which could result in confusion for
   those not familiar with both systems.

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