From: Bram Moolenaar Date: Sat, 30 Jul 2016 14:36:01 +0000 (+0200) Subject: patch 7.4.2124 X-Git-Tag: v7.4.2124 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=623cf88f9c5ad49cce8e846af29a1bb9346c7481;p=vim 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 e5d9ff94d..39376bdab 100644 --- 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 ae7b4de1b..9c771022e 100644 --- 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, /**/