diff options
| author | lonerover <pathfinder1644@yahoo.com> | 2016-12-23 09:10:15 +0800 |
|---|---|---|
| committer | lonerover <pathfinder1644@yahoo.com> | 2016-12-23 09:13:05 +0800 |
| commit | 4682129449d84e7ed578d50ae20d8c688c849e2a (patch) | |
| tree | 785875ef4c303ee155ba428f0d1061c01d647afe /src | |
| parent | f1bfd055a7f461fd6c3770b28d08b922838ee6b0 (diff) | |
| download | rneovim-4682129449d84e7ed578d50ae20d8c688c849e2a.tar.gz rneovim-4682129449d84e7ed578d50ae20d8c688c849e2a.tar.bz2 rneovim-4682129449d84e7ed578d50ae20d8c688c849e2a.zip | |
vim-patch:7.4.2124
Problem: diffmode test leaves files behind, breaking another test.
Solution: Delete the files.
https://github.com/vim/vim/commit/623cf88f9c5ad49cce8e846af29a1bb9346c7481
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_diffmode.vim | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim index e5d9ff94d9..39376bdabf 100644 --- a/src/nvim/testdir/test_diffmode.vim +++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c index ce103ec7dd..e9233f9bfb 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -316,7 +316,7 @@ static int included_patches[] = { // 2127, // 2126, // 2125, - // 2124, + 2124, 2123, // 2122 NA // 2121, |