Mercurial > hg
view tests/helper-runtests.sh @ 34552:33c8a6837181
merge: check for path conflicts when updating (issue5628)
When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.
Differential Revision: https://phab.mercurial-scm.org/D781
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Mon, 02 Oct 2017 14:05:30 -0700 |
parents | 054bcdad6042 |
children |
line wrap: on
line source
# # Avoid interference from actual test env: unset HGTEST_JOBS unset HGTEST_TIMEOUT unset HGTEST_PORT unset HGTEST_SHELL