Mercurial > hg

view README @ 16095:3eab42088be4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: just merge unknown file collisions The unknown file collision rule was introduced as an extension of the "should be clean when merging" rule. Unfortunately, it got applied to the normal update path, which should be happy to merge local changes. This patch gives us merges for unknown file collisions on update, while preserving abort for merge and update -c.
author Matt Mackall <mpm@selenic.com>
date Thu, 09 Feb 2012 17:54:47 -0600
parents a9f91c844a3b
children df5ecb813426
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

See http://mercurial.selenic.com/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.