diff mercurial/templatefilters.py @ 19886:e828975722c8

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Oct 2013 14:15:34 -0700
parents 681f7b9213a4 55c763926a28
children cce404b0c918 829f2dd99f5c
line wrap: on
line diff
--- a/mercurial/templatefilters.py	Wed Oct 09 14:15:20 2013 -0700
+++ b/mercurial/templatefilters.py	Wed Oct 09 14:15:34 2013 -0700
@@ -215,6 +215,7 @@
 _escapes = [
     ('\\', '\\\\'), ('"', '\\"'), ('\t', '\\t'), ('\n', '\\n'),
     ('\r', '\\r'), ('\f', '\\f'), ('\b', '\\b'),
+    ('<', '\\u003c'), ('>', '\\u003e')
 ]
 
 def jsonescape(s):