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

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

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
Gregory Szorc - - Load All Authors

File last commit:

r35587:96421278 default
r42803:3bc400cc default
Show More
config
7 lines | 399 B | text/plain | TextLexer
/ rust / .cargo / config
History | Annotation | Raw |Copy content |Copy permalink
# Rust builds with a modern MSVC and uses a newer CRT.
# Python 2.7 has a shared library dependency on an older CRT (msvcr90.dll).
# We statically link the modern CRT to avoid multiple msvcr*.dll libraries
# being loaded and Python possibly picking up symbols from the newer runtime
# (which would be loaded first).
[target.'cfg(target_os = "windows")']
rustflags = ["-Ctarget-feature=+crt-static"]