Mercurial > hg > mercurial-crew-with-dirclash

diff setup.py @ 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 06bc1ef248a6
children afe895fcc0d0
line wrap: on
line diff
--- a/setup.py
+++ b/setup.py
@@ -29,4 +29,4 @@ setup(name='mercurial',
                    glob.glob('templates/map-*') +
                    glob.glob('templates/*.tmpl'))], 
       cmdclass = { 'install_data' : install_package_data },
-      scripts=['hg'])
+      scripts=['hg', 'hgmerge'])