##// END OF EJS Templates
Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist.
Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist.

File last commit:

r2175:b2ae81a7 default
r2501:b73552a0 default
Show More
test-merge4.out
3 lines | 177 B | text/plain | TextLexer
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)