move vimfiles.stefan/... to vimfiles.stefan/after

Change-Id: I0469122bf65ddf24129151b2a82619011a6a4879

vimfiles.stefan/after/ftplugin/c.vim

@@ -50,7 +50,7 @@ setlocal spell
 let b:GrepFiles = '*.c *.h'
 
 " matchit.vim
-let b:match_words = '\<lint\s\+-save\>:\<lint\s\+-restore\>'
+let b:match_words = b:match_words . ',\<lint\s\+-save\>:\<lint\s\+-restore\>'
 
 " Adding spaces where needed
 " --------------------------

vimfiles.stefan/tools/gvimmerge.base.bat

@@ -0,0 +1,11 @@
+%echo off
+set vim=%~dp0..\..\..\vim74\gvim.exe
+set base=%1
+set mine=%2
+set theirs=%3
+set merged=%4
+
+if not exist %vim% (
+  echo gvim.exe nicht gefunden
+)
+echo %vim% %base% %mine% %theirs% %merged%

vimfiles.stefan/tools/gvimmerge.mine.bat

@@ -0,0 +1,11 @@
+%echo off
+set vim=%~dp0..\..\..\vim74\gvim.exe
+set base=%1
+set mine=%2
+set theirs=%3
+set merged=%4
+
+if not exist %vim% (
+  echo gvim.exe nicht gefunden
+)
+echo %vim% %base% %mine% %theirs% %merged%

vimfiles.stefan/tools/gvimmerge.theirs.bat

@@ -0,0 +1,11 @@
+%echo off
+set vim=%~dp0..\..\..\vim74\gvim.exe
+set base=%1
+set mine=%2
+set theirs=%3
+set merged=%4
+
+if not exist %vim% (
+  echo gvim.exe nicht gefunden
+)
+echo %vim% %base% %mine% %theirs% %merged%