From: Johannes Schindelin Date: Tue, 09 Oct 2007 12:37:40 GMT Subject: Re: [PATCH] mergetool: add support for ECMerge Message-ID: 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