aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/testdir/test_diffmode.vim2
-rw-r--r--src/nvim/version.c2
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,