Alex, I'm wondering if we should restore the .py extension to contrib/simplemerge. That way, on Windows, user can't just copy it to the search path, or even have setup.py install it along with hg, and it will be able to run like another exe. Without it, users will have to create a .cmd file to get it to work. Another layer of complication. Just a thought.