[MERGE] Win32 fixes

[Aaron Bentley]

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

Alexander Belchenko wrote:
| Alexander Belchenko пишет:
|
|> Aaron Bentley пишет:
|>
|> AFAIK, often this bug appears on windows when file was not explicitly
|> closed and immediately try to remove. I hope this helps.
|
|
| Yes. This is the root of problem. Patch with fix is attached.

Thank you.

| I use diff3 ported to win32 from http://gnuwin32.sf.net. This program
| implicitly convert all line-endings to CRLF. What we should do with this
| ugliness?

How gross.  I can only think of gross solutions, like transforming the
file before feeding it to diff3, and reversing the transform after diff3.

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

iD8DBQFESXff0F+nu1YWqI0RAhLAAJ4mChY0A8j2/gKDUHxxFLazwhnzvwCfffo1
yfoBkiNT1+WjL1AobU3U4BM=
=f8Wk
-----END PGP SIGNATURE-----