diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-13 13:03:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-13 13:03:11 +0200 |
| commit | 3b8defd0a52fc1276816608e7bb24b628ab14c2e (patch) | |
| tree | 51274af65eed16671abb4eceb00a7949c6f16699 /src/diff.c | |
| parent | bd9a53c06c8869ad811cb3dd01a309c9be7d7a63 (diff) | |
| download | vim-git-3b8defd0a52fc1276816608e7bb24b628ab14c2e.tar.gz | |
patch 8.1.0375: cannot use diff mode with Cygwin diff.exev8.1.0375
Problem: Cannot use diff mode with Cygwin diff.exe. (Igor Forca)
Solution: Skip over unrecognized lines in the diff output.
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/diff.c b/src/diff.c index 0055cba5a..59daf1eeb 100644 --- a/src/diff.c +++ b/src/diff.c @@ -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) |