diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-30 16:36:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-30 16:36:01 +0200 |
| commit | 623cf88f9c5ad49cce8e846af29a1bb9346c7481 (patch) | |
| tree | 20de07f5da78e427f981b28fcbfa1b6ab0200986 | |
| parent | 42093c0ec52e6ff29e80aae65ac6a744c7de79bb (diff) | |
patch 7.4.2124v7.4.2124
Problem: diffmode test leaves files behind, breaking another test.
Solution: Delete the files.
| -rw-r--r-- | src/testdir/test_diffmode.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index e5d9ff94d9..39376bdabf 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 ae7b4de1be..9c771022ea 100644 --- 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, |