##// END OF EJS Templates
merge-logic: improve merge failed because of conflicts message.
merge-logic: improve merge failed because of conflicts message.
marcink -
r1345:b48f493b default
Show More
Name Size Modified Last Commit Author
/ rhodecode / config
hook_templates
__init__.py Loading ...
conf.py Loading ...
deployment.ini_tmpl Loading ...
environment.py Loading ...
jsroutes.py Loading ...
licenses.json Loading ...
middleware.py Loading ...
patches.py Loading ...
routing.py Loading ...
routing_links.py Loading ...
utils.py Loading ...