From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Steffen Prohaska <prohaska@zib.de>
Cc: Theodore Tso <tytso@mit.edu>, git@vger.kernel.org
Subject: Re: [PATCH] mergetool: add support for ECMerge
Date: Tue, 9 Oct 2007 13:37:40 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0710091335580.4174@racer.site> (raw)
In-Reply-To: <1C50C046-3D61-4D55-8D38-B2D563C1FF2A@zib.de>
Hi,
On Tue, 9 Oct 2007, Steffen Prohaska wrote:
> I work on the msysgit project and I'd like to have mergetool available
> before I advertise git on Windows. It makes merging so much easier ;)
I would _hate_ to rely on a closed source program (in addition to Windows
itself) in msysGit.
And it seems that you cannot even get ECMerge for free in general.
What does TortoiseCVS use?
Ciao,
Dscho
next prev parent reply other threads:[~2007-10-09 12:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-08 21:22 [PATCH] mergetool: support absolute paths to tools by git config merge.<tool>path Steffen Prohaska
2007-10-08 21:22 ` [PATCH] mergetool: add support for ECMerge Steffen Prohaska
2007-10-08 21:44 ` Theodore Tso
2007-10-09 6:14 ` Steffen Prohaska
2007-10-09 12:37 ` Johannes Schindelin [this message]
2007-10-09 12:49 ` Steffen Prohaska
2007-10-09 13:03 ` Alan Hadsell
2007-10-09 13:17 ` Steffen Prohaska
2007-10-09 14:21 ` Alan Hadsell
2007-10-08 21:57 ` [PATCH] mergetool: support absolute paths to tools by git config merge.<tool>path Theodore Tso
2007-10-08 22:01 ` Theodore Tso
2007-10-09 6:30 ` Steffen Prohaska
2007-10-08 22:00 ` Frank Lichtenheld
2007-10-09 6:42 ` Steffen Prohaska
2007-10-09 12:35 ` 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=Pine.LNX.4.64.0710091335580.4174@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=prohaska@zib.de \
--cc=tytso@mit.edu \
/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;
as well as URLs for NNTP newsgroup(s).