Re: CVS branch merge conflicts

2005-06-23 Thread Henry Story
Sorry, wrong list. :-/ Henry On 23 Jun 2005, at 18:22, Henry Story wrote: 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 pr

Re: CVS branch merge conflicts

2005-06-23 Thread Henry Story
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