##// END OF EJS Templates
status: advertise --abort instead of 'update -C .' to abort a merge...
status: advertise --abort instead of 'update -C .' to abort a merge status has a part where it shows the conflict information and how to continue or abort. Couple of release ago, we got merge --abort and we should advertise that instead of 'hg update -C .' which is kind of ugly. I know we need to unify the logic here. Differential Revision: https://phab.mercurial-scm.org/D4168
Pulkit Goyal -
r39001:cf68e264 default
Show More
Name Size Modified Last Commit Author
/ tests / blacklists
README Loading ...
fsmonitor Loading ...
linux-vfat Loading ...

Put here definitions of blacklists for run-tests.py

Create a file per blacklist. Each file should list the names of tests that you
want to be skipped.
File names are meant to be used as targets for run-tests.py --blacklist
option.
Lines starting with # are ignored. White spaces are stripped.

e.g. if you create a blacklist/example file containing:
test-hgrc
# some comment
test-help
then calling "run-tests.py --blacklist blacklists/example" will exclude
test-hgrc and test-help from the list of tests to run.