* www/svn_1.5_releasenotes.html   (conflict-resolution): Update example to account for UI tweaks.
* www/svn_1.5_releasenotes.html
  (conflict-resolution): Update example to account for UI tweaks.

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