RE: [Tkdiff-discuss] 3 way merge

[Brown, D. <DBr...@ha...>]

I believe 3-way merging maybe got merged out of the current tkdiff =
version.
Look at the earlier versions. I use something based on 3.04, and it has =
3-way
merging.
=20
I've been hoping we can merge that feature back into the current, after =
the next
tkdiff release.
-- Dave Brown

-----Original Message-----
From: e.j...@ph... [mailto:e.j...@ph...]
Sent: Tuesday, June 24, 2003 4:35 AM
To: tkd...@li...
Subject: [Tkdiff-discuss] 3 way merge



I=B4m trying to set up TkDiff as a 3way merge tool.=20
It only passes 2 arguments to the diff tool.=20

 tkdiff myfile yourfile -a oldfile=20

the argument yourfile and oldfile are passed to the diff tool.=20
I=B4m running TkDiff under Cygwin.=20

Eddy
______________________________
E.J. Pronk
Philips Centre for Industrial Technology
Engineering & Test / BM Equipment Design
P.O.Box 218 / SAN-2181
5600 MD Eindhoven

Tel: +31 40 27 32693 /  Fax: +31 40 27 38950
Email: E.J...@Ph...