Mercurial > vim

diff src/testdir/test_diffmode.vim @ 14726:655f00c29c58 v8.1.0375

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0375: cannot use diff mode with Cygwin diff.exe commit https://github.com/vim/vim/commit/3b8defd0a52fc1276816608e7bb24b628ab14c2e Author: Bram Moolenaar <Bram@vim.org> Date: Thu Sep 13 13:03:11 2018 +0200 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.
author Christian Brabandt <cb@256bit.org>
date Thu, 13 Sep 2018 13:15:06 +0200
parents 195e8b1fcbbf
children b43ea03bb522
line wrap: on
line diff
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -519,7 +519,9 @@ func Test_diffexpr()
   endif
 
   func DiffExpr()
-    silent exe '!diff ' . v:fname_in . ' ' . v:fname_new . '>' . v:fname_out
+    " Prepent some text to check diff type detection
+    call writefile(['warning', '  message'], v:fname_out)
+    silent exe '!diff ' . v:fname_in . ' ' . v:fname_new . '>>' . v:fname_out
   endfunc
   set diffexpr=DiffExpr()
   set diffopt=foldcolumn:0