patch 7.4.1049

Problem:    Wordcount test still still fails on MS-Windows.
Solution:   Set 'fileformats' to "unix".

Author: brammool

src/testdir/test_wordcount.in

@@ -4,7 +4,7 @@ STARTTEST
 :so small.vim
 :so mbyte.vim
 :set enc=utf8
-:set selection=inclusive fileformat=unix
+:set selection=inclusive fileformat=unix fileformats=unix
 :new
 :fu DoRecordWin(...)
 :	wincmd k

src/version.c

@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1049,
 /**/
     1048,
 /**/