view README @ 27036:63d6bc874dea

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.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 15:40:28 -0800
parents 4b0fc75f9403
children 76b171209151
line wrap: on
line source

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.