facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity
A Scalable, User-Friendly Source Control System.
26,827 Commits 24 Branches 62 Tags 320 MiB
Rust 45.1%
Python 20.7%
C++ 10.5%
Perl 9.1%
TypeScript 7.3%
Other 7.1%
b3c05df6b2
Go to file
Siddharth Agarwal b3c05df6b2 filemerge: add support for change/delete conflicts to the ':local' merge tool 
This covers two of the four cases of change/delete conflicts -- in an upcoming
patch we'll make :other cover the other two.
2015-11-18 15:40:28 -08:00
contrib import-checker: allow symbol imports from hgweb.common and .request 2015-11-01 13:55:21 +09:00
doc spelling: trivial spell checking 2015-10-17 00:58:46 +02:00
hgext filemerge: return whether the file was deleted 2015-11-18 14:22:52 -08:00
i18n i18n: make sure to include translation of (DEPRECATED) 2015-11-03 22:44:57 +09:00
mercurial filemerge: add support for change/delete conflicts to the ':local' merge tool 2015-11-18 15:40:28 -08:00
tests strip: changing bookmark argument to be a list 2015-11-19 12:50:10 +05:30
.hgignore hgignore: ignore the PyCharm workspace folder 2014-10-13 11:46:04 +02:00
.hgsigs Added signature for changeset ec7a5e1a55ed 2015-11-09 16:24:13 -06: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 hg: add support for HGUNICODEPEDANTRY environment variable 2014-06-23 09:33:07 -04: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 makefile: add wheel build target 2015-10-09 12:30:46 -05:00
README urls: bulk-change primary website URLs 2015-09-30 15:43:49 -05:00
setup.py setup: import setup from setuptools if FORCE_SETUPTOOLS is set 2015-10-09 12:25:51 -05:00

README 

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.