forked from aniani/vim
patch 8.1.0375: cannot use diff mode with Cygwin diff.exe
Problem: Cannot use diff mode with Cygwin diff.exe. (Igor Forca) Solution: Skip over unrecognized lines in the diff output.
This commit is contained in:
@@ -1600,6 +1600,10 @@ diff_read(
|
||||
&& (tag_fgets(linebuf, LBUFLEN, fd) == 0)
|
||||
&& (STRNCMP(line, "@@ ", 3) == 0))
|
||||
diffstyle = DIFF_UNIFIED;
|
||||
else
|
||||
// Format not recognized yet, skip over this line. Cygwin diff
|
||||
// may put a warning at the start of the file.
|
||||
continue;
|
||||
}
|
||||
|
||||
if (diffstyle == DIFF_ED)
|
||||
|
Reference in New Issue
Block a user