From: Markus Heidelberg <markus.heidelberg@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, msysgit@googlegroups.com,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
David Aguilar <davvid@gmail.com>,
Charles Bailey <charles@hashpling.org>
Subject: [PATCH 0/3] git-mergetool/difftool: TortoiseMerge and (g)vimdiff for Windows
Date: Sun, 5 Apr 2009 14:40:32 +0200 [thread overview]
Message-ID: <200904051440.33154.markus.heidelberg@web.de> (raw)
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 reply other threads:[~2009-04-05 12:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-05 12:40 Markus Heidelberg [this message]
2009-04-05 12:42 ` [PATCH 1/3] doc/merge-config: list ecmerge as a built-in merge tool Markus Heidelberg
2009-04-05 12:42 ` [PATCH 2/3] git-mergetool/difftool: make (g)vimdiff workable under Windows Markus Heidelberg
2009-04-05 12:43 ` [PATCH 3/3] git-mergetool: add new merge tool TortoiseMerge Markus Heidelberg
2009-04-05 13:52 ` [PATCH 0/3] git-mergetool/difftool: TortoiseMerge and (g)vimdiff for Windows Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200904051440.33154.markus.heidelberg@web.de \
--to=markus.heidelberg@web.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox