##// 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:

r23399:fd5247a8 default
r49405:ce8c82a5 default
Show More
hgwebconfig
6 lines | 67 B | text/plain | TextLexer
[paths]
/ = /var/hg/repos/*
[web]
allow_push = *
push_ssl = False