A Scalable, User-Friendly Source Control System.
Go to file
Pulkit Goyal 444d924446 morestatus: check whether the conflict message is None before printing
There are cases like bisect when the conflict message can be None. So we make
sure that we don't print None in that case.

Thanks to Martin for catching this.

Differential Revision: https://phab.mercurial-scm.org/D461
2017-08-21 16:43:37 +05:30
contrib contrib: make import checker always think in terms of bytes 2017-08-22 12:58:28 -04:00
doc doc: port check-seclevel.py to be Python 2/3 portable 2017-05-28 15:51:26 -04:00
hgdemandimport demandimport: disable if chg is being used 2017-08-16 10:44:06 -07:00
hgext releasenotes: add check flag for use of admonitions and its validity 2017-08-13 19:58:45 +05:30
hgext3rd extensions: also search for extension in the 'hgext3rd' package 2016-03-11 10:30:08 +00:00
i18n i18n: ignore docstring for modules under mercurial 2017-08-15 21:06:26 +09:00
mercurial morestatus: check whether the conflict message is None before printing 2017-08-21 16:43:37 +05:30
tests morestatus: check whether the conflict message is None before printing 2017-08-21 16:43:37 +05:30
.editorconfig mercurial: add editorconfig 2016-04-05 18:10:33 +01:00
.hgignore merge with stable 2017-06-24 15:50:13 -04:00
.hgsigs Added signature for changeset 229937197835 2017-08-10 18:46:55 -04:00
CONTRIBUTING contributing: add new file with a pointer to the wiki 2016-10-08 10:39:00 -04:00
CONTRIBUTORS Add note to CONTRIBUTORS file 2007-11-07 21:10:30 -06:00
COPYING COPYING: refresh with current address from fsf.org 2011-06-02 11:17:02 -05:00
hg init: turn on demandimport for Python 3.6 and above 2017-05-21 12:51:01 -07:00
hgeditor spelling: trivial spell checking 2015-10-17 00:58:46 +02:00
hgweb.cgi urls: bulk-change primary website URLs 2015-09-30 15:43:49 -05:00
Makefile merge with stable 2017-08-21 21:35:06 -07:00
README README: make paragraphs before example code end with "::" for reST syntax 2017-07-31 21:47:53 +09:00
setup.py merge with stable 2017-08-21 21:35:06 -07:00

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.