anchor.diff:  
       response.setContentType("text/html; charset="+wiki.getContentEncoding() );
   
  -    usertext = TextUtil.replaceString( usertext, "<", "&lt;" );
  -    usertext = TextUtil.replaceString( usertext, ">", "&gt;" );
  -    usertext = TextUtil.replaceString( usertext, "\n", "<BR />" );
  +    //
  +    //  Make the user and conflicting text presentable for display.
  +    //
  +    usertext = StringEscapeUtils.escapeXml( usertext );
  +    usertext = TextUtil.replaceString( usertext, "\n", "<br />" );
   
       pageContext.setAttribute( "usertext",
                                 usertext,
  
positive.code:     
      String conflicttext = wiki.getText(pagereq);
  
      conflicttext = TextUtil.replaceString( conflicttext, "<", "&lt;" );
      conflicttext = TextUtil.replaceString( conflicttext, ">", "&gt;" );
      conflicttext = TextUtil.replaceString( conflicttext, "\n", "<BR />" );
  
      pageContext.setAttribute( "conflicttext",
                                conflicttext,
  
negative.code: <%@ page import="org.apache.log4j.*" %>
  <%@ page import="org.apache.commons.lang.*" %>
  <%@ page import="com.ecyrd.jspwiki.*" %>
  <%@ page import="java.util.Calendar,java.util.Date" %>
  <%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase" %>
  