##// 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
.coveragerc
18 lines | 229 B | text/plain | TextLexer
[run]
branch = True
include =
rhodecode/lib/*
rhodecode/model/*
rhodecode/controllers/*
omit =
rhodecode/lib/vcs/remote/*
rhodecode/lib/dbmigrate/*
[report]
exclude_lines =
raise NotImplementedError