From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 9 Jul 2014 11:43:29 +0000 (+0200)
Subject: updated for version 7.4.356
X-Git-Tag: v7.4.356
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc57bb2f85a857495c2302a93f444e7c7cb19b4b;p=vim

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/.gitignore b/.gitignore
index f13ca061b..f247dd198 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,11 +62,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
index 0921f40d4..909ce569f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    356,
 /**/
     355,
 /**/