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.
clktmr · Jul 9, 2014 · cc57bb2 · cc57bb2
1 parent 8bb1c3e
commit cc57bb2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    356,
 /**/
     355,
 /**/
-Original file line number
+Diff line change
@@ Expand Up / @@ -734,6 +734,8 @@ static char *(features[]) = @@
     static int included_patches[] =
     {   /* Add new patch number below this line */
+    /**/
+,
     /**/
 ,
     /**/
@@ Expand Down @@