# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1451907004 -3600
# Node ID 26d13d73837f4c1a8e2b0b957e861ef24df6aff7
# Parent  a924d469a0d7b07d166d6aca5a0baa0d03651d35
commit https://github.com/vim/vim/commit/c7803a1c42228566ee2e2efcd621b21d0a8ed3ea
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Jan 4 12:26:23 2016 +0100

    patch 7.4.1048
    Problem:    Wordcount test still fail on MS-Windows.
    Solution:   Set 'fileformat' 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
+:set selection=inclusive fileformat=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 */
 /**/
+    1048,
+/**/
     1047,
 /**/
     1046,