mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +03:00
A Scalable, User-Friendly Source Control System.
4cebb13c1a
Summary: As written, merge tools and drivers are responsible for raising `InMemoryMergeConflictsError` themselves. We shouldn't finish merge.update with unresolved files under IMM. However, we had this fallback in case we missed a spot, and it turns out there was such a spot: D8886237. D8699551's addition of required parameters to the constructor broke this fallback. So, this adds the parameters back in. Reviewed By: quark-zju Differential Revision: D8886238 fbshipit-source-id: 111fcce6a5a38d126c0118208e508c04b7566971 |
||
---|---|---|
contrib | ||
distutils_rust | ||
doc | ||
exec/scm_daemon | ||
hgdemandimport | ||
hgext | ||
hgext3rd | ||
i18n | ||
lib | ||
mercurial | ||
tests | ||
.editorconfig | ||
.flake8 | ||
.gitignore | ||
.hg-vendored-crates | ||
.hgsigs | ||
.jshintrc | ||
.watchmanconfig | ||
CONTRIBUTING | ||
CONTRIBUTORS | ||
COPYING | ||
gen_version.py | ||
hg | ||
hgeditor | ||
hgweb.cgi | ||
Makefile | ||
README.rst | ||
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.