##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

simplemerge: make minimize() a free function...
simplemerge: make minimize() a free function IMO, `Merge3Text` should be about merging text without knowing about conflict markers. "Conflict minimization" is about making conflict markers smaller, so it should be moved out. This patch does that. I'll refactor it next. Differential Revision: https://phab.mercurial-scm.org/D11980
Martin von Zweigbergk -
r49412:ad0c6bf6 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 ...