facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity
A Scalable, User-Friendly Source Control System.
21,354 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%
bcc0ea1fe2
Go to file
Durham Goode bcc0ea1fe2 merge: add conflict marker formatter (BC) 
Adds a conflict marker formatter that can produce custom conflict marker
descriptions. It can be set via ui.mergemarkertemplate. The old behavior
can be used still by setting ui.mergemarkers=basic.

The default format is similar to:

  {node|short} {tag} {branch} {bookmarks} - {author}: "{desc|firstline}"

And renders as:

  contextblahblah
  <<<<<<< local: c7fdd7ce4652 - durham: "Fix broken stuff in my feature branch"
  line from my changes
  =======
  line from the other changes
  >>>>>>> other: a3e55d7f4d38  master - sid0: "This is a commit to master th...
  morecontextblahblah
2014-05-08 16:50:22 -07:00
contrib check-code: check for consistent usage of the websub filter in hgweb templates 2014-05-17 17:11:06 +08:00
doc doc: show short description of each commands in generated documents 2014-03-11 14:36:40 +09:00
hgext convert: mercurial source: convert global tags only - not local tags 2014-05-16 02:30:27 +02:00
i18n i18n-ja: synchronized with 96dc46d2a8cd 2014-04-30 23:20:46 +09:00
mercurial merge: add conflict marker formatter (BC) 2014-05-08 16:50:22 -07:00
tests merge: add conflict marker formatter (BC) 2014-05-08 16:50:22 -07:00
.hgignore Makefile: do update on a temporary copy of a po file 2013-11-05 09:43:36 +01:00
.hgsigs Added signature for changeset 4034358387c1 2014-05-01 17:48:02 -05: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 rename util.set_binary to setbinary 2011-05-06 15:25:35 +02:00
hgeditor Fixed a bashism with the use of $RANDOM in hgeditor. 2010-05-19 18:06:35 +02:00
hgweb.cgi mq: add a warning about uncommitted changes for qfinish 2011-11-10 15:40:34 -06:00
Makefile build: initial support for in-tree autobuilding recipes 2014-05-07 17:58:13 -05:00
README readme: mention how to run in-place 2012-03-02 21:43:55 +02:00
setup.py setup.py, make: avoid problems with outdated, existing hgext/__index__.py* 2014-05-05 16:54:15 +02: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 http://mercurial.selenic.com/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.