##// END OF EJS Templates
mergetools: enable the `checkconflicts` option for Araxis Merge...
mergetools: enable the `checkconflicts` option for Araxis Merge This must have been a typo. This matches the config read in filemerge, as well as the TortoiseHg config file. Differential Revision: https://phab.mercurial-scm.org/D9633

File last commit:

r35587:96421278 default
r46784:714085c1 default
Show More
config
7 lines | 399 B | text/plain | TextLexer
# 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"]