From 4682129449d84e7ed578d50ae20d8c688c849e2a Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Fri, 23 Dec 2016 09:10:15 +0800
Subject: 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
---
 src/nvim/testdir/test_diffmode.vim | 2 ++
 src/nvim/version.c                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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,
-- 
cgit