3 messages in com.perforce.perforce-user[p4] Merging on UNIX
FromSent OnAttachments
Anton Rang30 Oct 2000 07:40 
axel...@coremedia-ag.com30 Oct 2000 09:29 
Rick Macdonald30 Oct 2000 10:06 
Subject:[p4] Merging on UNIX
From:Rick Macdonald (ric@vsl.com)
Date:10/30/2000 10:06:11 AM
List:com.perforce.perforce-user

On Mon, 30 Oct 2000 axel.wienberg at coremedia-ag.com wrote:

I also found the emacs support package quite lacking. We are using an external tool, tkdiff, http://www.ede.com/free/tkdiff/, which is sponsored by AccuRev, but still works fine with Perforce. TkDiff comes as a Tcl script. You`ll want Tcl anyway for tkp4

Cool! I've been waiting for tkdiff to be upgraded to do 3-way diffs for about 18 months. Somehow I missed seeing that it happened 11 months ago (in v3.05).

Just thought I'd through that in in case others out there thought, like I, that tkdiff still only did 2-way diffs.

...RickM...