Mercurial > public > mercurial-scm > hg-stable
diff mercurial/templatefilters.py @ 21873:cf599f8a2da8
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 14 Jul 2014 18:53:03 -0500 |
| parents | cce404b0c918 829f2dd99f5c |
| children | 13e3f07d74a3 |
line wrap: on
line diff
--- a/mercurial/templatefilters.py Sat Jul 12 20:44:00 2014 -0700 +++ b/mercurial/templatefilters.py Mon Jul 14 18:53:03 2014 -0500 @@ -216,7 +216,7 @@ _escapes = [ ('\\', '\\\\'), ('"', '\\"'), ('\t', '\\t'), ('\n', '\\n'), ('\r', '\\r'), ('\f', '\\f'), ('\b', '\\b'), - ('<', '\\u003c'), ('>', '\\u003e') + ('<', '\\u003c'), ('>', '\\u003e'), ('\0', '\\u0000') ] def jsonescape(s):