##// END OF EJS Templates
merge.applyupdates: don't return early if merge driver's conclude failed...
merge.applyupdates: don't return early if merge driver's conclude failed Somewhat silly oversight -- this prevented the progress bar from being reset.

File last commit:

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