patch 7.4.1698

Problem:    Two tests fail when running tests with MinGW. (Michael Soyka)
Solution:   Convert test_getcwd.ok test_wordcount.ok to unix fileformat.

src/testdir/Make_ming.mak

@@ -65,9 +65,11 @@ win32:	fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32)
 	echo ALL DONE
 
 fixff:
+	# TODO: find a way to avoid changing the distributed files.
 	-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=dos|upd" +q *.in *.ok
 	-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=unix|upd" +q \
-		dotest.in test60.ok test71.ok test74.ok test_listchars.ok
+		dotest.in test60.ok test71.ok test74.ok test_listchars.ok \
+		test_getcwd.ok test_wordcount.ok
 
 clean:
 	-$(DEL) *.out

src/version.c

@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1698,
 /**/
     1697,
 /**/