mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
A Scalable, User-Friendly Source Control System.
d83b895da6
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. |
||
---|---|---|
contrib | ||
doc | ||
hgext | ||
i18n | ||
mercurial | ||
tests | ||
.hgignore | ||
.hgsigs | ||
CONTRIBUTORS | ||
COPYING | ||
hg | ||
hgeditor | ||
hgweb.cgi | ||
Makefile | ||
README | ||
setup.py |
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.