patch 8.2.2609: test disabled on MS-Windows even though it should work

Problem:    Test disabled on MS-Windows even though it should work.
Solution:   Restore the condition for skipping the test. (Ken Takata,
            closes #7970)
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index e8be191..169c213 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -109,7 +109,9 @@
 endfunc
 
 func Test_help_arg()
-  CheckNotMSWindows
+  if !has('unix') && has('gui_running')
+    throw 'Skipped: does not work with gvim on MS-Windows'
+  endif
 
   if RunVim([], [], '--help >Xtestout')
     let lines = readfile('Xtestout')
diff --git a/src/version.c b/src/version.c
index 9d46da6..ef2f0cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2609,
+/**/
     2608,
 /**/
     2607,