Johannes Schindelin, 05.04.2009: > Hi, > > On Sat, 4 Apr 2009, Markus Heidelberg wrote: > > > Under Windows vimdiff and gvimdiff are not available as symbolic links, > > but as batch files vimdiff.bat and gvimdiff.bat. These files weren't > > found by 'type vimdiff' which led to the following error: > > > > The merge tool vimdiff is not available as 'vimdiff' > > > > Even if they were found, it wouldn't work to invoke these batch files > > from git-mergetool. > > > > To solve this, use vim and gvim (vim.exe and gvim.exe) and pass the -d > > command line switch over to them. > > > > Signed-off-by: Markus Heidelberg <markus.heidelberg@xxxxxx> > > --- > > > > This patch goes on top of the current difftool/mergetool patches from David. > > ,.. which is a pity, because I could have applied them directly to > msysGit's 'devel' branch otherwise. There is currently a lot of refactoring going on in difftool/mergetool, so of course I didn't send this to Junio against 'master'. But if you want I can send it for you based on 'master' (or 4msysgit.git 'devel'). Junio, is this something for maint? I'm not sure, since this problem only occurs on Windows and 'maint' isn't interesting for msysgit ATM. Markus -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
