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 | bac203ea2d0e3b2a5e4eae4dbe48244e592926e2 (patch) | |
| tree | a47634a6ad9b056c24e8eb33838a35ba9e0bcdc8 | |
| parent | 13cf77ba1715803355029ed119e55a12f6865db1 (diff) | |
updated for version 7.4.648v7.4.648
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 55bf77ec6b..4b17f96f4b 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 21215ae3a1..ac5f6770de 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, |