Last September I posted a patch that allows for the integration of new merge tools based on file extension. It's alpha-quality code, but a good demonstration that, despite what certain individuals have claimed, the CVS design is robust enough to accommodate an extensible merge mechanism. I believe the same applies to 2-way diffs, but that's not included in the patch.
On Tuesday, May 28, 2002, at 10:40 AM, [EMAIL PROTECTED] wrote: > I know you can set another edit in CVS with setting > the variable CVSEDITOR. > Is there a similar variable for diff? > > I like tkdiff and I was hoping I could use it. > > Thanks in advance! > > Sally Smart Miller > I used to be Smart then I got married. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs