view README @ 12046:8e7960feb139 stable

Fix merge-tools.checkconflicts re.match only looks at the beginning of the merged file, and without re.MULTILINE the file had to end with ">>>>>>> something". Now conflict markers inside the file are found, too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 26 Aug 2010 17:38:43 +0200
parents a41f2840f9c6
children 5c6c10e6b5a6
line wrap: on
line source

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.