[TxMt] Re: Show differences

Andrew Jaffe a.h.jaffe at gmail.com
Sun Mar 1 21:52:26 UTC 2009



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!)

Andrew


>
> hope that helps!
> -Nick
>
> On Sat, Feb 28, 2009 at 2:13 AM, Scott Haneda<talklists-+/aIZXz99E/QT0dZR+AlfA at public.gmane.org>  wrote:
>> Hello all, every day I shave a few percentage points off the time I
>> spend in BBedit, and get closer to 100% in TM.
>>
>> Today, I am stuck on showing differences.  TM has a lot of good tools
>> to show the differences in a standard `diff`y kind of way.
>>
>> What I usually find useful, was in BBedit, I could compare the two
>> most front files, a window would pop out below the files, sort of a
>> left, right, and bottom frame display.  I could then move through the
>> line differences in the files.
>>
>> Any way to do this in TM?
>> --
>> Scott
>>
>> * If you contact me off list replace talklists@ with scott@ *
>>
>>
>>
>>
>>
>>
>> _______________________________________________
>> textmate mailing list
>> textmate-qhrM8SXbD5LrQoZeqNtYVVaTQe2KTcn/@public.gmane.org
>> http://lists.macromates.com/listinfo/textmate
>>
>
> _______________________________________________
> textmate mailing list
> textmate-qhrM8SXbD5LrQoZeqNtYVVaTQe2KTcn/@public.gmane.org
> http://lists.macromates.com/listinfo/textmate
>





More information about the textmate mailing list