##// 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
Martin von Zweigbergk -
r49395:a0cb1623 default
Show More
Name Size Modified Last Commit Author
/ contrib / packaging / macosx
Readme.html Loading ...
Welcome.html Loading ...
distribution.xml Loading ...

http://www.w3.org/TR/html4/strict.dtd">

<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="Content-Style-Type" content="text/css">
<title>Read Me - Important Information</title>
<style type="text/css">
p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica}
p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica}
p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000fed}
span.s1 {text-decoration: underline}
span.s2 {font: 12.0px Courier}
</style>
</head>
<body>

Before you install




This is an OS X version of Mercurial that depends on the default Python installation.




After you install




This package installs the hg executable as /usr/local/bin/hg. See hg debuginstall for more info on file locations.




Documentation




Visit the https://mercurial-scm.org/">Mercurial web site and wiki




There's also a free book, https://book.mercurial-scm.org/">Distributed revision control with Mercurial




Reporting problems




If you run into any problems, please file a bug online:


https://bz.mercurial-scm.org/">https://bz.mercurial-scm.org/


</body>
</html>