##// END OF EJS Templates
simplemerge: split out function for rendering :merge3 conflict markers...
simplemerge: split out function for rendering :merge3 conflict markers The results in some duplicate, but the code is very straight-forward and I think it's worth it to have each conflict marker style in a separate function. Differential Revision: https://phab.mercurial-scm.org/D11978

File last commit:

r43177:92593d72 default
r49410:69e76b2a default
Show More
requirements.txt.in
4 lines | 28 B | text/plain | TextLexer
boto3
paramiko
pypsrp
twine