patch 7.4.2124

Problem:    diffmode test leaves files behind, breaking another test.
Solution:   Delete the files.

diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index e5d9ff94d919e1c70f22b565db74b054b5759b37..39376bdabf70de0dd559d3bc69230204f4e4402f 100644 (file)
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -145,6 +145,8 @@ func Test_vert_split()
   call assert_equal(0, &cursorbind)
   call assert_equal(1, &wrap)
 
+  call delete('Xtest')
+  call delete('Xtest2')
   windo bw!
 endfunc
 

diff --git a/src/version.c b/src/version.c
index ae7b4de1be115aa19a6e246862ae00ffeb8253f7..9c771022ea5f46d2b488ca920c5d5cc119574b60 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2124,
 /**/
     2123,
 /**/