From d2ea7cf10a4d026ebd402594d656af7d5c811c24 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 30 May 2021 20:54:13 +0200 Subject: Update runtime files --- runtime/doc/diff.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'runtime/doc/diff.txt') diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 62201d450..2a231b15b 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 8.2. Last change: 2021 Feb 10 +*diff.txt* For Vim version 8.2. Last change: 2021 May 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -345,9 +345,11 @@ between file1 and file2: > The ">" is replaced with the value of 'shellredir'. -The output of "diff" must be a normal "ed" style diff or a unified diff. Do -NOT use a context diff. This example explains the format that Vim expects for -the "ed" style diff: > +The output of "diff" must be a normal "ed" style diff or a unified diff. A +context diff will NOT work. For a unified diff no context lines can be used. +Using "diff -u" will NOT work, use "diff -U0". + +This example explains the format that Vim expects for the "ed" style diff: > 1a2 > bbb -- cgit v1.2.1