git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] mergetool-lib: make (g)vimdiff workable under Windows

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Apr 5, 2009, 09:35 UTC
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:
Show 16 quoted lines
> 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

Previous: Markus HeidelbergNext: Markus Heidelberg
Message 2 of 4 in “mergetool-lib: make (g)vimdiff workable under Windows”
  1. mergetool-lib: make (g)vimdiff workable under WindowsMarkus Heidelberg, Apr 4, 2009
  2. Johannes SchindelinApr 5, 2009
  3. Markus HeidelbergApr 5, 2009
  4. Junio C HamanoApr 5, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.