Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
239:75840796e8e2 240:737c66b68290
27 data_files=[('mercurial/templates', 27 data_files=[('mercurial/templates',
28 ['templates/map'] + 28 ['templates/map'] +
29 glob.glob('templates/map-*') + 29 glob.glob('templates/map-*') +
30 glob.glob('templates/*.tmpl'))], 30 glob.glob('templates/*.tmpl'))],
31 cmdclass = { 'install_data' : install_package_data }, 31 cmdclass = { 'install_data' : install_package_data },
32 scripts=['hg']) 32 scripts=['hg', 'hgmerge'])