From 981217c11f92b37f2baa51492cbe12e85d0ea493 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 8 Jul 2021 22:20:50 +0200
Subject: [PATCH] patch 8.2.3131: MS-Windows: ipv6 channel test is very flaky
 in the GUI

Problem:    MS-Windows: ipv6 channel test is very flaky in the GUI.
Solution:   Skip the test.
---
 src/testdir/test_channel.vim | 6 ++++++
 src/version.c                | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 37dfd2586..f88cba004 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -252,6 +252,12 @@ endfunc
 
 func Test_communicate_ipv6()
   CheckIPv6
+
+  " FIXME: this test is very flaky on MS-Windows with the GUI
+  if has('gui_running') && has('win32')
+    throw 'Skipped: test is very flaky with MS-Windows in GUI'
+  endif
+
   call Test_communicate()
 endfunc
 
diff --git a/src/version.c b/src/version.c
index fb76c39c6..30db741ed 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3131,
 /**/
     3130,
 /**/
-- 
2.50.1