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

[PATCH 0/3] git-mergetool/difftool: TortoiseMerge and (g)vimdiff for Windows

From
Markus Heidelberg <markus.heidelberg@web.de>
Date
Apr 5, 2009, 12:40 UTC
Message-ID
<200904051440.33154.markus.heidelberg@web.de>

Patches 2/3 and 3/3 are already in 'da/difftool' in 'pu'. This series is based on 'master', now they can be applied to 4msysgit.git. 'da/difftool' should be recreated anyway.

Markus Heidelberg (3):
  doc/merge-config: list ecmerge as a valid merge tool
  git-mergetool/difftool: make (g)vimdiff workable under Windows
  git-mergetool: add new merge tool TortoiseMerge
 Documentation/git-mergetool.txt      |    3 ++-
 Documentation/merge-config.txt       |    3 ++-
 contrib/difftool/git-difftool-helper |   10 ++++++++--
 git-mergetool.sh                     |   26 +++++++++++++++++++++-----
 4 files changed, 33 insertions(+), 9 deletions(-)
Next: Markus Heidelberg
Message 1 of 5 in “git-mergetool/difftool: TortoiseMerge and (g)vimdiff for Windows”
  1. 0/3 git-mergetool/difftool: TortoiseMerge and (g)vimdiff for WindowsMarkus Heidelberg, Apr 5, 2009
  2. 1/3 doc/merge-config: list ecmerge as a built-in merge toolMarkus Heidelberg, Apr 5, 2009
  3. 2/3 git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg, Apr 5, 2009
  4. 3/3 git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg, Apr 5, 2009
  5. Johannes SchindelinApr 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.