##// END OF EJS Templates
abort: added support for merge...
abort: added support for merge This adds support of `hg merge --abort` to `hg abort` plan. This involves refactoring `hg.merge` into two different functions removing the abort logic of `merge` from `hg.merge` and then creating a seperate `hg.abortmerge` to handle the abort logic so that the abortion of merge can be called independently. `hg.abortmerge` is then registered as `abortfunc` for the state detection API so that `commands.abort` can use it to deal with an unfinished merge operation. Results are shown as tests. Differential Revision: https://phab.mercurial-scm.org/D6588

File last commit:

r26421:4b0fc75f default
r42803:3bc400cc default
Show More
postinstall.txt
9 lines | 248 B | text/plain | TextLexer
Bryan O'Sullivan
Add post-install text file.
r1289 Welcome to Mercurial for Windows!
---------------------------------
For configuration and usage directions, please read the ReadMe.html
file that comes with this package.
Matt Mackall
Remove hard-coded version numbers and release notes from packaging
r3863 Also check the release notes at:
Lee Cantey
Update Windows release notes and install script for v0.9
r2276
Matt Mackall
urls: bulk-change primary website URLs
r26421 https://mercurial-scm.org/wiki/WhatsNew