diff contrib/simplemerge @ 28126:562a073a2a1b

tests: load json with no fallback The json module should be available in Python 2.6 or newer.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 09 Jan 2016 13:20:15 +0900
parents 863075fd4cd0
children d83ca854fa21
line wrap: on
line diff