[TxMt] FileMerge revisited

[Trevor Harmon]

On Apr 27, 2006, at 10:35 PM, Allan Odgaard wrote:

> On 28/4/2006, at 3:02, Trevor Harmon wrote:
>
>> [...] The problem, though, is that TextMate is hard-coded for diff  
>> [...]
>
> That’s intentional, since some user had his svn diff set to  
> something generating tty coloring of the diff output, useful in  
> Terminal, but not TextMate.
>
> I guess we could remove the hardcoded use of diff and simply  
> instruct that user to only setup an alternative diff for  
> interactive shells.

Yes, judging by the recent thread, I think there are more users who  
want to be able to change the diff command than there are those who  
need it hard-coded.

Although perhaps svn_diff.rb could be extended (yes, even more) to  
make everyone happy. For instance, it could check whether a TextMate  
environment variable, say TM_SVN_DIFF_CMD, is set. If so, the bundle  
would use this variable for the diff cmd; otherwise, it would default  
to the global Subversion preference, the way my modified version does  
now.

Trevor

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