From e0197a4d76420e611e9da2f437f01cb31d65cdb0 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 26 Sep 2017 16:04:01 -0400
Subject: vim-patch:8.0.1025

Problem:    Stray copy command in test.
Solution:   Remove the copy command.

https://github.com/vim/vim/commit/4e83961985abb78757b135f29ac4ffde675247af
---
 src/nvim/testdir/test_mksession.vim | 1 -
 src/nvim/version.c                  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/test_mksession.vim b/src/nvim/testdir/test_mksession.vim
index 13fb07c7e0..4774cf4af5 100644
--- a/src/nvim/testdir/test_mksession.vim
+++ b/src/nvim/testdir/test_mksession.vim
@@ -148,7 +148,6 @@ func Test_mksession_one_buffer_two_windows()
 
   close
   bwipe!
-  !cp Xtest_mks.out /tmp
   call delete('Xtest_mks.out')
 endfunc
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9f75f75d4f..fa8b495703 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -78,7 +78,7 @@ static char *features[] = {
 // clang-format off
 static const int included_patches[] = {
   // 1026,
-  // 1025,
+  1025,
   1024,
   // 1023,
   // 1022,
-- 
cgit