diff tests/test-merge6.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 f2719b387380
children 2428e8ec0793
line wrap: on
line diff