* www/svn_1.6_releasenotes.html   (output-changes): Mention conflict summaries printed by update and merge.
* www/svn_1.6_releasenotes.html
  (output-changes): Mention conflict summaries printed by update and merge.

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