[BUG] win32-related bug in changeset.py::make_contents_change

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> After disabling this construct on win32 merge works again.
> Patch attached.

Thanks, but I've done some significant reworking on merge, and that code
is now obsolete.  The new code does not do an equivalent test.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDUXQG0F+nu1YWqI0RApl3AJwMuEAVEddzglTl7sSFgsqpw1Il1gCeOQLI
G9hxPJdwNMOHxxwZ3ooNhEc=
=Cv+X
-----END PGP SIGNATURE-----