2 Mar
2009
2 Mar
'09
10:59 p.m.
On Mar 2, 2009, at 23:32, Scott Haneda wrote:
On Mar 1, 2009, at 1:52 PM, Andrew Jaffe wrote:
On 28/2/09 22:06, Nick wrote:
try the filemerge bundle. it can automatically diff svn revisions in filemerge, which offers a very nice gui for diffing and conflict resolution.
Or "merge selected files" in the Diff bundle.
filemerge (aka opendiff) is a Mac GUI program which does what you want and is called by TM in these circumstances. (I still have a soft spot for the pure emacs version of parsing diff output, though!)
Thanks, I had no idea this app existed, is this in the Developer Tools, I can not locate the app itself?
Look in /Developer/Applications/Utilities.
Regards Morten Liebach