# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1404906209 -7200
# Node ID 34465a179ce21c827cab4c65a75e6b490600a96f
# Parent  b8f703a4e55fa122b5031ed077ef3eeb49e7feb6
updated for version 7.4.356
Problem:    Mercurial does not ignore memfile_test. (Daniel Hahler)
Solution:   Add memfile_test to ignored files, remove trailing spaces.

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -64,11 +64,12 @@ src/xxd/xxd.dSYM
 src/po/vim.pot
 
 # Generated by "make test"
-src/po/*.ck 
-src/testdir/mbyte.vim 
-src/testdir/mzscheme.vim 
-src/testdir/lua.vim 
-src/testdir/small.vim 
-src/testdir/tiny.vim 
+src/po/*.ck
+src/testdir/mbyte.vim
+src/testdir/mzscheme.vim
+src/testdir/lua.vim
+src/testdir/small.vim
+src/testdir/tiny.vim
 src/testdir/test*.out
 src/testdir/test.log
+src/memfile_test
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    356,
+/**/
     355,
 /**/
     354,