sapling/eden/hg-server
Skotch Vail a3a02abd7a debug for merge picker
Summary:
I am debugging why some people get vim to pop up during a merge conflict and some do not.

also fixes a few lint issues

Reviewed By: DurhamG

Differential Revision: D27684419

fbshipit-source-id: f636d71c18353a3816d1e442c05790cf4fd7b90b
2021-04-19 12:22:27 -07:00
..
contrib server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
distutils_rust server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
doc server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
edenscm Daily arc lint --take BLACK 2021-04-15 04:28:09 -07:00
edenscmnative server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
exec server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
hgcache_size_logger server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
i18n server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
lib fix hg-server panic formatting 2021-04-15 06:20:25 -07:00
newdoc server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
pystubs server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
slides server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
tests debug for merge picker 2021-04-19 12:22:27 -07:00
.editorconfig server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
.flake8 server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
.gitignore server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
COPYING server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
gen_version.py server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
hgeditor server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
Makefile server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
README.rst server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
setup3.py server: copy hg to a new hg-server directory 2021-04-09 10:09:06 -07:00
setup.py server: copy hg to a new hg-server directory 2021-04-09 10:09: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.