Mercurial > hg
annotate mercurial/templates/json/changelist.tmpl @ 26572:c7850af6bb75
filemerge._merge: drop no longer necessary 'if r:' check
Cleanup from an earlier patch to make premerge be directly called from the main
filemerge function.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 08 Oct 2015 14:16:19 -0700 |
parents | 0bf54479a9eb |
children |
rev | line source |
---|---|
24588
0bf54479a9eb
json: implement {shortlog} and {changelog} templates
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
1 \{ |
0bf54479a9eb
json: implement {shortlog} and {changelog} templates
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
2 "node": {node|json}, |
0bf54479a9eb
json: implement {shortlog} and {changelog} templates
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
3 "changeset_count": {changesets|json}, |
0bf54479a9eb
json: implement {shortlog} and {changelog} templates
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
4 "changesets": [{join(entries%changelistentry, ", ")}] |
0bf54479a9eb
json: implement {shortlog} and {changelog} templates
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
5 } |