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

r1253:204c7847 merge default
r1345:b48f493b default
Show More
.bumpversion.cfg
6 lines | 144 B | text/x-ini | IniLexer
[bumpversion]
current_version = 4.6.0
message = release: Bump version {current_version} to {new_version}
[bumpversion:file:rhodecode/VERSION]