[Merge] disable diff3 on win32

[Aaron Bentley]

This patch disables diff3 on win32, because typical diff3 
implementations on win32 do not properly preserve line endings.

The lack of diff3 isn't very significant, because we still provide our 
default native python implementation Merge3, as well as knit/weave merging.

Aaron
-------------- next part --------------
A non-text attachment was scrubbed...
Name: disable_win32_diff3.patch
Type: text/x-patch
Size: 1999 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060503/b5913469/attachment.bin