##// END OF EJS Templates
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

File last commit:

r7659:25ac72ca default
r49395:a0cb1623 default
Show More
mercurial.ico
0 lines | 2.2 KiB | image/x-icon | TextLexer
/ contrib / win32 / mercurial.ico
rendered-image