##// 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
Martin von Zweigbergk -
r49410:69e76b2a default
Show More
Name Size Modified Last Commit Author
/ mercurial / revlogutils
__init__.py Loading ...
concurrency_checker.py Loading ...
constants.py Loading ...
deltas.py Loading ...
docket.py Loading ...
flagutil.py Loading ...
nodemap.py Loading ...
randomaccessfile.py Loading ...
revlogv0.py Loading ...
rewrite.py Loading ...
sidedata.py Loading ...