[MERGE] Win32 fixes

[Alexander Belchenko]

Aaron Bentley пишет:
> On the subject of Windows, there's one bug I'm having a hell of a time
> with.  It's a merge test: test_contents_merge2 -- it invokes diff3 on
> files in a temp directory, then tries to delete the temp directory.
> 
> shutil.rmtree fails to delete the BASE file, with permission denied, for
> no good reason I can tell.  I can successfully remove it using os.remove
> after the tests have completed.

AFAIK, often this bug appears on windows when file was not explicitly 
closed and immediately try to remove. I hope this helps.

--
Alexander