##// 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
select2x2.png
0 lines | 845 B | image/png | TextLexer
/ rhodecode / public / images / select2x2.png
rendered-image