mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
A Scalable, User-Friendly Source Control System.
510a16a534
Add a new merge action to handle a path conflict by renaming the conflicting file to a safe name. The rename is just to avoid problems on the filesystem. The conflict is still considered unresolved until the user marks the original path as resolved. Differential Revision: https://phab.mercurial-scm.org/D777 |
||
---|---|---|
contrib | ||
doc | ||
hgdemandimport | ||
hgext | ||
hgext3rd | ||
i18n | ||
mercurial | ||
tests | ||
.editorconfig | ||
.hgignore | ||
.hgsigs | ||
CONTRIBUTING | ||
CONTRIBUTORS | ||
COPYING | ||
hg | ||
hgeditor | ||
hgweb.cgi | ||
Makefile | ||
README | ||
setup.py |
Mercurial ========= Mercurial is a fast, easy to use, distributed revision control tool for software developers. Basic install:: $ make # see install targets $ make install # do a system-wide install $ hg debuginstall # sanity-check setup $ hg # see help Running without installing:: $ make local # build for inplace usage $ ./hg --version # should show the latest version See https://mercurial-scm.org/ for detailed installation instructions, platform-specific notes, and Mercurial user information.