From 2fdff44580555659d9ea31886fc149c09642ecf3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 9 Jul 2014 13:43:29 +0200
Subject: [PATCH] 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.

---
 .hgignore     | 13 +++++++------
 src/version.c |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.hgignore b/.hgignore
index f82aed7e3b..9ff923c9f6 100644
--- 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
index 0921f40d4a..909ce569f4 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,
 /**/