THere's also xxdiff which does do directory diffs and has 3-pane merge.
http://xxdiff.sourceforge.net/
Reid.
On Fri, 28 May 2004 16:04:43 -0600
"Jeff Cave" <jeff.cave@sunergon.com> wrote:
>If you are running windows you could install tortoiseSVN. It has
>tortoiseMerge which is what I have been using for all of my diff
>comparisons.
>
>The only complaint I would have is that it does not do directory diffs (I
>think I know why it doesn't but grrr anyway). I use windiff (ms tool) for
>that.
>
>-----Original Message-----
>From: Kurt Guenther
>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 Sat May 29 00:12:06 2004