A couple of people pointed me to Eclipse for this, and it does indeed
work well for this (thoug
the quality of the diffs is not so good as IntelliJs). If it were not
so complicated to transform
a checked out CVS project into an eclipse project it would be perfect.
Henry
On 23 Jun 2005, at 12:36, Henry Story wrote:
Hi, I am looking for a tool to make it pleasant to resolve merge
conflicts between a branch and the
HEAD of a cvs repository. This aspect of IntelliJ is broken. Anyone
know a good tool that one could
use for this?
Henry Story
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Java-dev mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
http://lists.apple.com/mailman/options/java-dev/email@hidden
