Mercurial > hg > mercurial-crew-with-dirclash
view README @ 4358:465b9ea02868
Import 3-way merge code from bzr
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | 1158d7018052 |
children |
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://www.selenic.com/mercurial/ for detailed installation instructions, platform-specific notes, and Mercurial user information.