##// END OF EJS Templates
simplemerge: convert `merge_lines()` away from generator...
simplemerge: convert `merge_lines()` away from generator We always consume all the lines and put them in a list anyway. By making the function not a generator, we can later make it return an additional value (to indicate if there were conflicts). Differential Revision: https://phab.mercurial-scm.org/D11973

File last commit:

r24588:0bf54479 default
r49388:3f5bc446 default
Show More
changelist.tmpl
5 lines | 124 B | application/x-cheetah | CheetahLexer
\{
"node": {node|json},
"changeset_count": {changesets|json},
"changesets": [{join(entries%changelistentry, ", ")}]
}