facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-06 04:43:19 +03:00
Code Issues Projects Releases Wiki Activity
A Scalable, User-Friendly Source Control System.
34,625 Commits 26 Branches 30 Tags 355 MiB
Rust 45.4%
Python 20.6%
C++ 10.4%
Perl 9%
TypeScript 7.4%
Other 6.9%
08776110c4
Go to file
Ryan McElroy 08776110c4 merge: additional test cases to show merge-halting behavior 
In the previous patches, we allowed the user to specify that
a merge process should be halted when a filemerge fails.

This patch adds tests that show additional places this logic
can be utilized -- via the options to do additional post-filemerge
checks to determine if a file merge was successful.

Differential Revision: https://phab.mercurial-scm.org/D952
2017-10-06 06:48:43 -07:00
contrib parsers: allow clang-format here 2017-10-16 14:53:57 -04:00
doc build: make install in "/doc" failed if the destination dir contained spaces 2017-10-11 01:19:48 +02:00
hgdemandimport demandimportpy3: update to pass import checker 2017-08-22 14:14:34 -04:00
hgext rebase: add support to output nodechanges 2017-10-18 04:31:46 +05:30
hgext3rd extensions: also search for extension in the 'hgext3rd' package 2016-03-11 10:30:08 +00:00
i18n scmutil: extract helper functions that returns human-readable change id 2017-09-24 12:43:57 +09:00
mercurial sparse-read: skip gaps too small to be worth splitting 2017-10-18 09:07:48 +02:00
tests merge: additional test cases to show merge-halting behavior 2017-10-06 06:48:43 -07:00
.clang-format clang-format: configuration for the clang-format source formatter 2015-01-24 17:04:25 -05:00
.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 ff1cee5a3854 2017-10-01 05:28:54 -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 dispatch: move initialization of sys.std* files 2017-10-02 07:18:24 +01: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 target to apply clang-format in-place 2015-09-14 14:52:20 -04:00
README.rst doc: rename README to README.rst 2017-09-26 08:37:17 +02:00
setup.py windows: add an experimental option for long paths support 2017-10-09 02:30:23 -07:00

README.rst 

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.