changeset 6645:0a859da6714b v7.4.648

updated for version 7.4.648 Problem: Tests broken on MS-Windows. Solution: Delete wrong copy line. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Fri, 27 Feb 2015 22:12:34 +0100
parents 6de626a7a6b8
children 22d190c6dfd3
files src/testdir/Make_dos.mak src/version.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -84,7 +84,6 @@ win32:	nolog $(SCRIPTS16) $(SCRIPTS) $(S
 $(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
--- 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,