[TxMt] Re: Show differences

Morten Liebach m at mongers.org
Mon Mar 2 22:59:23 UTC 2009


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

-- 
http://blog.zentience.org/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 1920 bytes
Desc: not available
URL: <http://lists.macromates.com/textmate/attachments/20090302/a975cfdc/attachment.p7s>


More information about the textmate mailing list