Mercurial > hg > gitweb

comparison README @ 240:737c66b68290

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace tkmerge with hgmerge -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Replace tkmerge with hgmerge hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch. hg will use hgmerge unless overridden with HGMERGE manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP vYI6qlyWKQZ01ObUTAIg92o= =+mRH -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 03 Jun 2005 18:27:55 -0800
parents d255d99a7cbd
children afe895fcc0d0
comparison
equal deleted inserted replaced
239:75840796e8e2 240:737c66b68290
16 To install in your home directory (~/bin and ~/lib, actually), run: 16 To install in your home directory (~/bin and ~/lib, actually), run:
17 17
18 $ python2.3 setup.py install --home=~ 18 $ python2.3 setup.py install --home=~
19 $ export PYTHONPATH=${HOME}/lib/python # add this to your .bashrc 19 $ export PYTHONPATH=${HOME}/lib/python # add this to your .bashrc
20 $ export PATH=${HOME}/bin:$PATH # 20 $ export PATH=${HOME}/bin:$PATH #
21
22 You'll also need to set up a tool to handle three-way merges:
23
24 $ export HGMERGE=tkmerge # customize this
25 21
26 And finally: 22 And finally:
27 23
28 $ hg # test installation, show help 24 $ hg # test installation, show help
29 25