# HG changeset patch # User Christian Brabandt # Date 1469889905 -7200 # Node ID 103e79a0ad8debb89abadc7bab6859467fe1f419 # Parent 357779820785856a589f1533563b70a9a20f5513 commit https://github.com/vim/vim/commit/623cf88f9c5ad49cce8e846af29a1bb9346c7481 Author: Bram Moolenaar Date: Sat Jul 30 16:36:01 2016 +0200 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2124, +/**/ 2123, /**/ 2122,