diff tests/test-merge7.t @ 22426:f6b533e64ed6

encoding: add json escaping filter This ends up here because it needs to be somewhat encoding aware.
author Matt Mackall <mpm@selenic.com>
date Mon, 15 Sep 2014 13:12:49 -0500
parents b081decd9062
children bd625cd4e5e7
line wrap: on
line diff