[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Mac OS X GUI merge tool

From: John Peacock <john.peacock_at_havurah-software.org>
Date: Sun, 06 Apr 2008 22:09:08 -0400

Gavin 'Beau' Baumanis wrote:
> being a recent convert to a MAC I after a GIO / Merge/diff tool please?

There is a version of kdiff3 for Max OS X available from the main site
(check Google). And Meld is a Python script so you can run that anywere.

You might also find this discussion helpful:

http://www.yolinux.com/TUTORIALS/Subversion.html#GDIFF

especially the svndiffwrapper script which allows you to drive kdiff3
(or some other merge tool) when svn would normally create conflict files.

HTH

John

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-07 04:09:31 CEST

This is an archived mail posted to the Subversion Users mailing list.