Integrate merge.py into msi.py.
authormartin.v.loewis <martin.v.loewis@6015fed2-1504-0410-9fe1-9d1591cc4771>
Tue, 16 Mar 2010 18:49:28 +0000 (18:49 +0000)
committermartin.v.loewis <martin.v.loewis@6015fed2-1504-0410-9fe1-9d1591cc4771>
Tue, 16 Mar 2010 18:49:28 +0000 (18:49 +0000)
commitf380f24f8458ac1611462e31644a6b2f0eee2779
treedc9b22a6161179ea723ec78950ca14b294648746
parentcce186117b7b768a8cadaaceca0bf16bec6742ee
Integrate merge.py into msi.py.

git-svn-id: http://svn.python.org/projects/python/trunk@78996 6015fed2-1504-0410-9fe1-9d1591cc4771
Tools/msi/merge.py [deleted file]
Tools/msi/msi.py