##// END OF EJS Templates
merge: disallow merge abort in case of an unfinished operation (issue6160)...
merge: disallow merge abort in case of an unfinished operation (issue6160) This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so as to avoid partial abort of these operations in case merge abort is called at an interrupted step. The patch adds a `cmdutil.getunfinishedstate` function which checks for operations under progress and returns a `statecheck` object for it. Differential Revision: https://phab.mercurial-scm.org/D6607

File last commit:

r26421:4b0fc75f default
r42780:b8d54f46 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