A Scalable, User-Friendly Source Control System.
Go to file
Steve Borho f61b2a6d58 eol: do not abort when win32text is found, only warn
The win32text extension does not break eol or vice-versa, so it is not a fatal
error to have both of them enabled.  It's just folly.  So spewing warnings in
this condition is preferrable to aborting.  When both extensions are enabled,
the user now sees:

% hg st
the eol extension is incompatible with the win32text extension
win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
M hgext/eol.py
2011-03-13 10:03:06 -05:00
contrib mergetools: add alternate registry keys for 32bit apps on 64bit O/S 2011-03-08 13:35:01 -06:00
doc filemerge: introduce a 'regkeyalt' merge tool variable 2011-03-08 13:05:18 -06:00
hgext eol: do not abort when win32text is found, only warn 2011-03-13 10:03:06 -05:00
i18n i18n-pt_BR: synchronized with 294954a643c2 2011-03-09 15:29:50 -03:00
mercurial bookmarks: fix update of the current bookmark during rename 2011-03-13 15:42:24 +01:00
tests tests: fix failures introduced in 6c855f5350cd 2011-03-13 15:59:24 +01:00
.hgignore hgignore: ignore more bytecode 2011-02-03 07:58:54 +01:00
.hgsigs Added signature for changeset a5d3d1222e50 2011-03-10 11:30:38 -06:00
CONTRIBUTORS Add note to CONTRIBUTORS file 2007-11-07 21:10:30 -06:00
COPYING Add COPYING 2005-06-17 09:32:13 -08:00
hg setup/hg: handle hg being a symlink when appending relative libdir to sys.path 2010-10-21 09:58:22 -07:00
hgeditor Fixed a bashism with the use of $RANDOM in hgeditor. 2010-05-19 18:06:35 +02:00
hgweb.cgi *: add executable bit to a few files that were missing it. 2010-10-26 12:18:37 +02:00
Makefile build: don't delete precious version information on 'make clean' 2010-12-08 11:18:26 -06:00
README README: add small introduction 2010-10-27 12:05:37 +02:00
setup.py setup.py: use StrictVersion instead of manual comparison 2011-03-12 13:02:03 +01: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

See http://mercurial.selenic.com/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.