diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-07-09 13:43:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-07-09 13:43:29 +0200 |
| commit | cc57bb2f85a857495c2302a93f444e7c7cb19b4b (patch) | |
| tree | 1bc78d82e18af773f97df4b7ee01832c472b3f06 | |
| parent | 8bb1c3e53ef0ee259cfa5f9b3a3a91ec1fa90fb0 (diff) | |
| download | vim-git-cc57bb2f85a857495c2302a93f444e7c7cb19b4b.tar.gz | |
updated for version 7.4.356v7.4.356
Problem: Mercurial does not ignore memfile_test. (Daniel Hahler)
Solution: Add memfile_test to ignored files, remove trailing spaces.
| -rw-r--r-- | .gitignore | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 6 deletions
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 @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 356, +/**/ 355, /**/ 354, |