##// 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
VERSION
1 line | 5 B | text/plain | TextLexer
4.6.0