##// 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 -
r49389:912668d9 default
Show More
Name Size Modified Last Commit Author
/ contrib / automation / hgautomation
__init__.py Loading ...
aws.py Loading ...
cli.py Loading ...
linux.py Loading ...
pypi.py Loading ...
ssh.py Loading ...
try_server.py Loading ...
windows.py Loading ...
winrm.py Loading ...