From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 05 Apr 2009 09:35:23 GMT
Subject: Re: [PATCH] mergetool-lib: make (g)vimdiff workable under Windows
Message-ID: <alpine.DEB.1.00.0904051134210.10279@pacific.mpi-cbg.de>
In-Reply-To: <200904041517.55890.markus.heidelberg@web.de>


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@web.de>
> ---
> 
> 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.

Thanks,
Dscho