diff tests/test-rebase-conflicts.t @ 24714:84859415a4c9

json: implement {comparison} template Similar to {filediff}, we abbreviate some property names to cut down on string bloat.
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 10 Apr 2015 22:26:53 -0400
parents 9347c15d8136
children bd625cd4e5e7 af5b2f4ed594
line wrap: on
line diff