##// END OF EJS Templates
simplemerge: make merge_lines() a free function...
simplemerge: make merge_lines() a free function IMO, the rendering of a conflict as text with merge markers should be separate from the code for resolving conflicts. The latter is what `Merge3Text` is mostly about already. Differential Revision: https://phab.mercurial-scm.org/D11974
Martin von Zweigbergk -
r49406:c6649c53 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 ...