diff options
| author | Bram Moolenaar <bram@vim.org> | 2015-02-27 22:12:34 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2015-02-27 22:12:34 +0100 |
| commit | 48531a68df4f52512f750a3a4811541c208f74c6 (patch) | |
| tree | c4c260ee235bd1bc8685da591a9a687d2fb6af86 | |
| parent | 4d5f23563e4a98bb07411181ec1dafc4e8cefffd (diff) | |
| download | vim-48531a68df4f52512f750a3a4811541c208f74c6.tar.gz | |
Problem: Tests broken on MS-Windows.
Solution: Delete wrong copy line. (Ken Takata)
| -rw-r--r-- | src/testdir/Make_dos.mak | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 55bf77ec..4b17f96f 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -84,7 +84,6 @@ $(DOSTMP_INFILES): $(*B).in $(TEST_OUTFILES): $(DOSTMP)\$(*B).in -@if exist test.out DEL test.out move $(*B).in $(*B).in.bak - copy $*.in $(*B).in copy $(DOSTMP)\$(*B).in $(*B).in copy $(*B).ok test.ok $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $(*B).in diff --git a/src/version.c b/src/version.c index 21215ae3..ac5f6770 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 648, +/**/ 647, /**/ 646, |