##// END OF EJS Templates
merge-logic: improve merge failed because of conflicts message.
merge-logic: improve merge failed because of conflicts message.

File last commit:

r1:854a839a default
r1345:b48f493b default
Show More
deployment.ini_tmpl
4 lines | 224 B | text/plain | TextLexer
Usage of make-config is deprecated.
Please use rhodecode-config to generate RhodeCode .ini config file.
rhodecode-config is a part of RhodeCode Tools package. Install it via
pip install https://rhodecode.com/dl/tools/latest