Do not have svnmerge.py refer to svnmerge.sh as the official version, since svnmerge.py has many more features and is newer, I now consider svnmerge.py as the official one and svnmerge.sh the depreciated version.
Do not have svnmerge.py refer to svnmerge.sh as the official version,
since svnmerge.py has many more features and is newer, I now consider
svnmerge.py as the official one and svnmerge.sh the depreciated
version.

* contrib/client-side/svnmerge.py:
  s/official svnmerge/svnmerge.sh/.

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