changeset 6033:34465a179ce2 v7.4.356

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.
author Bram Moolenaar <bram@vim.org>
date Wed, 09 Jul 2014 13:43:29 +0200
parents b8f703a4e55f
children 10e73b8fa682
files .hgignore src/version.c
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,