This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
A graphical merging tool for resolving merge conflicts has to be created.
Reassigning...
Started to work on it...
Merging tool created, it registers itself as a service into the IDE. Integration with CVS profiles of Generic VCS implemented. Integrated in build Apr 25.
Confirming in development build #200206190100 of NetBeans 3.4.