##// END OF EJS Templates
mergestate: don't pop stateextras when there are no conflicts on filemerge...
mergestate: don't pop stateextras when there are no conflicts on filemerge Even if `filemerge.filemerge()` didn't result in conflicts, we should not remove stateextras for a file since we now use that for more things than just merge time information. We use stateextras to store information which is required to be used by commit. I tracked this down while finding why a patch of mine which adds more commit related information does not work as expected and looses the extras in mergestate. Differential Revision: https://phab.mercurial-scm.org/D10148
Pulkit Goyal -
r47539:1099ca17 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>