# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1451908804 -3600
# Node ID b4419a42ac324ec39436a1594f844650529590e3
# Parent  a1d8efb15dcfc2448cd0f54d736c58cbb086a0ca
commit https://github.com/vim/vim/commit/485dace817a99f4cf92a598845d27c8ee685df93
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Jan 4 12:45:29 2016 +0100

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

diff --git a/src/testdir/test_wordcount.in b/src/testdir/test_wordcount.in
--- a/src/testdir/test_wordcount.in
+++ b/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
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1049,
+/**/
     1048,
 /**/
     1047,