--- a/setup.py Fri Jun 03 13:44:34 2005 -0800
+++ b/setup.py Fri Jun 03 18:27:55 2005 -0800
@@ -29,4 +29,4 @@
glob.glob('templates/map-*') +
glob.glob('templates/*.tmpl'))],
cmdclass = { 'install_data' : install_package_data },
- scripts=['hg'])
+ scripts=['hg', 'hgmerge'])