# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1448998204 -3600
# Node ID 631cd8059bf4317b232f2d1e04ced6a0102c21a5
# Parent  e9846c6bf3a49037da9e2182a77e32bd8243b63b
commit https://github.com/vim/vim/commit/5311c02f25eed8f34e8a80becb98e86264f371c3
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Dec 1 20:19:26 2015 +0100

    patch 7.4.947
    Problem:    Test_listchars fails with MingW. (Michael Soyka)
    Solution:   Add the test to the ones that need the fileformat fixed.
                (Christian Brabandt)

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -120,7 +120,7 @@ win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(S
 fixff:
 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
-		dotest.in test60.ok test71.ok test74.ok
+		dotest.in test60.ok test71.ok test74.ok test_listchars.ok
 
 clean:
 	-$(DEL) *.out
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 */
 /**/
+    947,
+/**/
     946,
 /**/
     945,