Skip to content
Snippets Groups Projects
Pulkit Goyal's avatar
Pulkit Goyal authored
merge.update() is quite hard to understand, found this an easy win.

The end goal is to have better organized merge and mergestate handling and then
fix some related bugs.

Differential Revision: https://phab.mercurial-scm.org/D8740
796b63b0
History
Name Last commit Last update
contrib
doc
hgdemandimport
hgext
hgext3rd
i18n
mercurial
relnotes
rust
tests
.arcconfig
.clang-format
.editorconfig
.hgignore
.hgsigs
.hgtags
.jshintrc
CONTRIBUTING
CONTRIBUTORS
COPYING
Makefile
README.rst
black.toml
hg
hgeditor
hgweb.cgi
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.