[Merge] disable diff3 on win32

[John Arbash Meinel]

Aaron Bentley wrote:
> 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
> 

Doesn't diff3 support the --binary flag (same as diff & patch). I
remember dealing with all of this for Arch.

I realize there is no "native" diff3 on Windows anyway. You have to
install it in some non-standard method. But I don't think you have to
specifically disable the tests.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060504/ada9acaa/attachment.pgp