From: "Alan Hadsell" <ahadsell@gmail.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: "Steffen Prohaska" <prohaska@zib.de>,
"Theodore Tso" <tytso@mit.edu>,
git@vger.kernel.org
Subject: Re: [PATCH] mergetool: add support for ECMerge
Date: Tue, 9 Oct 2007 09:03:40 -0400 [thread overview]
Message-ID: <2b3a6fcd0710090603l3c3578caq3bfa6a1b8ec583f@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0710091335580.4174@racer.site>
On 10/9/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> What does TortoiseCVS use?
They don't actually include it in the package, but they recommend
WinMerge http://winmerge.org/, which is free (GPL).
--
Alan Hadsell
next prev parent reply other threads:[~2007-10-09 13:04 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
2007-10-09 12:49 ` Steffen Prohaska
2007-10-09 13:03 ` Alan Hadsell [this message]
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=2b3a6fcd0710090603l3c3578caq3bfa6a1b8ec583f@mail.gmail.com \
--to=ahadsell@gmail.com \
--cc=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).