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

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

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
Matt Mackall - - Load All Authors

File last commit:

r26421:4b0fc75f default
r47539:1099ca17 default
Show More
postinstall.txt
9 lines | 248 B | text/plain | TextLexer
/ contrib / win32 / postinstall.txt
History | Annotation | Raw |Copy content |Copy permalink
Welcome to Mercurial for Windows!
---------------------------------
For configuration and usage directions, please read the ReadMe.html
file that comes with this package.
Also check the release notes at:
https://mercurial-scm.org/wiki/WhatsNew