patch 7.4.2316
Problem: Channel sort test is flaky.
Solution: Add a check the output has been read.
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 251de60..4b51111 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -831,6 +831,7 @@
call assert_equal("dead", job_status(g:job))
sp sortout
+ call WaitFor('line("$") > 3')
call assert_equal('Reading from channel output...', getline(1))
if a:all
call assert_equal(['aaa', 'bbb', 'ccc', 'ddd', 'eee'], getline(2, 6))
diff --git a/src/version.c b/src/version.c
index 297830f..04cf59e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2316,
+/**/
2315,
/**/
2314,
