##// 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 / controllers
admin
__init__.py Loading ...
base_references.py Loading ...
bookmarks.py Loading ...
branches.py Loading ...
changelog.py Loading ...
changeset.py Loading ...
compare.py Loading ...
debug_style.py Loading ...
feed.py Loading ...
files.py Loading ...
followers.py Loading ...
forks.py Loading ...
home.py Loading ...
journal.py Loading ...
pullrequests.py Loading ...
search.py Loading ...
summary.py Loading ...
tags.py Loading ...
users.py Loading ...
utils.py Loading ...