RE: Graphical Merge Tool ?

WinMerge comes to mind http://winmerge.sourceforge.net/ it's a 2-panel merge
program, pretty easy to use and it will work recursively down the dir.
Structure.

If you download perforce from their website, they have a three-way merge
tool that can be installed - licensing is a little vague for the utility.
On one webpage, it states that it is free.

See http://www.perforce.com/perforce/products/p4winmerge.html

There are also various CVS conflict editors

http://gaiacrtn.free.fr/cce/
http://sourceforge.net/projects/conflicteditor

and

http://www.majentis.com/Products/CVSConflictEditor.html

which can help when you are trying to handle conflict tags with in cvs. I'm
a newbie with svn but I believe that it tags conflicts in a similar fashion
to cvs. Please correct me if I am wrong

hth,
jb

-----Original Message-----
From: Kurt Guenther [mailto:kurtg@serent.com]
Sent: Friday, May 28, 2004 2:23 PM
To: subversion-user
Subject: Graphical Merge Tool ?

Does anybody know of a graphical merge tool? I know some commercial
vendors that have decent wars, but I haven't found an open source. It
doesn't need to be integrated into subversion.

--Kurt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri May 28 23:58:58 2004