diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-24 16:59:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 16:59:14 -0400 |
| commit | a282a177d3320db25fa8f854cbcdbe0bc6abde7f (patch) | |
| tree | 137f0f1babdd1fc776f4b63a275604f7c526841d /src/nvim/diff.c | |
| parent | 0a653f7ab98dfc05bf0532b9f81bc19377031900 (diff) | |
| parent | 370e65ed7cb299b49306e96f13cf6b5c7f717a6c (diff) | |
| download | rneovim-a282a177d3320db25fa8f854cbcdbe0bc6abde7f.tar.gz rneovim-a282a177d3320db25fa8f854cbcdbe0bc6abde7f.tar.bz2 rneovim-a282a177d3320db25fa8f854cbcdbe0bc6abde7f.zip | |
Merge pull request #14634 from janlazo/vim-8.2.2880
vim-patch:8.2.{511,1689,1957,2880,2884}
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 31b7b1bd8f..5f8b81822b 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -982,12 +982,14 @@ static int check_external_diff(diffio_T *diffio) char_u linebuf[LBUFLEN]; for (;;) { - // There must be a line that contains "1c1". + // For normal diff there must be a line that contains + // "1c1". For unified diff "@@ -1 +1 @@". if (vim_fgets(linebuf, LBUFLEN, fd)) { break; } - if (STRNCMP(linebuf, "1c1", 3) == 0) { + if (STRNCMP(linebuf, "1c1", 3) == 0 + || STRNCMP(linebuf, "@@ -1 +1 @@", 11) == 0) { ok = kTrue; } } |