From: Sebastian Schuberth Date: Sun, 27 Feb 2011 10:57:57 GMT Subject: Re: Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23) Message-ID: In-Reply-To: <4D69E355.7010104@gmail.com> On Sun, Feb 27, 2011 at 06:38, Chris Packham wrote: > Sorry that I missed it (I didn't really look too hard). No problem, at least this got me dig out my series again ;-) > 3-way merge tool. Trying to indicate v3 only make sense to me (at least > until they release a v4 :) True. In that case, read it as "Beyond Compare version 3 an up" ;-) > In linux it's bcompare, although BCompare is the eventual executable > > chrisp@laptop:~> rpm -q --filesbypkg bcompare > bcompare                  /usr/bin/bcompare > bcompare                  /usr/lib/beyondcompare/BCompare Ah, OK, being on Windows I just checked the TAR.GZ file, which does not contain /usr/bin/bcompare (but bcompare.sh, which probably gets installed by install.sh). > Unfortunately /usr/bin/bcompare is a little more involved than a symlink > so for linux we need to call bcompare. Do we have a nice way of handling > this? We could just treat them completely separate but that seems a but > like sweeping the problem under the carpet. We could just call "bcompare" on Windows, too. As Windows is case-insensitive, it will just work. > with your suggestion. We should probably make use of the -title options > to remove ambiguity. Good idea, I'll look into this. > I'll give it a whirl when I get a chance. I suspect I'll need to handle > the BCompare/bcompare thing but that's not a huge issue. You could probably just wait a few minutes until I have pushed out an update for this patch. -- Sebastian Schuberth