[Merge] disable diff3 on win32

[Alexander Belchenko]

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.
> 
> Doesn't diff3 support the --binary flag (same as diff & patch). I
> remember dealing with all of this for Arch.

I have diff3 (diffutils from gnuwin32.sf.net) and this diff3 does not
have --binary flag (even implicit):

D:\>diff3 --help
Usage: C:\Program Files\GnuWin32\bin\diff3.EXE [OPTION]... MYFILE
OLDFILE YOURFILE
Compare three files line by line.

   -e  --ed  Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
   -E  --show-overlap  Output unmerged changes, bracketing conflicts.
   -A  --show-all  Output all changes, bracketing conflicts.
   -x  --overlap-only  Output overlapping changes.
   -X  Output overlapping changes, bracketing them.
   -3  --easy-only  Output unmerged nonoverlapping changes.

   -m  --merge  Output merged file instead of ed script (default -A).
   -L LABEL  --label=LABEL  Use LABEL instead of file name.
   -i  Append `w' and `q' commands to ed scripts.
   -a  --text  Treat all files as text.
   --strip-trailing-cr  Strip trailing carriage return on input.
   -T  --initial-tab  Make tabs line up by prepending a tab.
   --diff-program=PROGRAM  Use PROGRAM to compare files.

   -v  --version  Output version info.
   --help  Output this help.

If a FILE is `-', read standard input.
Exit status is 0 if successful, 1 if conflicts, 2 if trouble.

Report bugs to <bug-gnu-utils at gnu.org>.

D:\>diff3 -v
diff3 (GNU diffutils) 2.8.7
Written by Randy Smith.

Copyright (C) 2004 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

> 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.

But this test fails with non-native line-endings.

--
Alexander