# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1469276105 -7200
# Node ID 3e0ab13ddd1249e4ff88bbe90d84fb74c30bee95
# Parent  dd74e943e3c4f956a2ee39a00a93a2ae6c96e2d3
commit https://github.com/vim/vim/commit/a58c58b7e1404bb91d59d14539b41390284e7026
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Jul 23 14:01:15 2016 +0200

    patch 7.4.2093
    Problem:    Netbeans test fails once in a while.  Leaving log file behind.
    Solution:   Add it to the list of flaky tests.  Disable logfile.

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -125,7 +125,7 @@ else
 endif
 
 " Names of flaky tests.
-let s:flaky = ['Test_reltime()']
+let s:flaky = ['Test_reltime()', 'Test_nb_basic()']
 
 " Locate Test_ functions and execute them.
 set nomore
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1344,4 +1344,4 @@ func Test_close_lambda()
 endfunc
 
 " Uncomment this to see what happens, output is in src/testdir/channellog.
- call ch_logfile('channellog', 'w')
+" call ch_logfile('channellog', 'w')
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2093,
+/**/
     2092,
 /**/
     2091,