##// END OF EJS Templates
Clarified message when nothing to merge is seen....
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
Thomas Arendsen Hein -
r2548:0229ff95 default
Show More
Name Size Modified Last Commit Author
/ contrib / macosx
Readme.html Loading ...
Welcome.html Loading ...
macosx-build.txt 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></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 not a stand-alone version of Mercurial.




To use it, you must have the Universal MacPython 2.4.3 from http://www.python.org">www.python.org installed.




You can download MacPython 2.4.3 from here:


http://www.python.org/ftp/python/2.4.3/Universal-MacPython-2.4.3-2006-04-07.dmg">http://www.python.org/ftp/python/2.4.3/Universal-MacPython-2.4.3-2006-04-07.dmg




After you install




This package installs the hg executable in /usr/local/bin. This directory may not be in your shell's search path. Don't forget to check.




Reporting problems




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


http://www.selenic.com/mercurial/bts">http://www.selenic.com/mercurial/bts


</body>
</html>