[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: vimdiff teaming with Subversion and other merging queries

From: Arild Fines <arild.fines_at_broadpark.no>
Date: 2006-08-25 17:19:42 CEST

> -----Original Message-----
> From: Troy Curtis Jr [mailto:troycurtisjr@gmail.com]
> Sent: Friday, August 25, 2006 12:42 AM
> To: users@subversion.tigris.org
> Subject: vimdiff teaming with Subversion and other merging queries
> Also related to merging, I am trying to find a good three-way merge
> tool that has the bitkeeper/submerge layout (to original files
> veritcally split above the merge file). I did like submerge when I was
> able to get a working version, but I can't seem to get it to compile

Have you tried kdiff3? http://kdiff3.sourceforge.net

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 25 17:28:31 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.