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.

Bug 21190

Summary: Create Graphical Merging Tool
Product: utilities Reporter: Martin Entlicher <mentlicher>
Component: DiffAssignee: Martin Entlicher <mentlicher>
Status: VERIFIED FIXED    
Severity: blocker Keywords: UI
Priority: P1    
Version: 3.x   
Hardware: All   
OS: All   
URL: http://diff.netbeans.org/plans/features34.html#Merging Tool
Issue Type: TASK Exception Reporter:
Bug Depends on:    
Bug Blocks: 22910    

Description Martin Entlicher 2002-03-05 15:10:11 UTC
A graphical merging tool for resolving merge conflicts has to be created.
Comment 1 Martin Entlicher 2002-03-07 15:55:39 UTC
Reassigning...

Comment 2 Martin Entlicher 2002-03-07 16:13:28 UTC
Started to work on it...
Comment 3 Martin Entlicher 2002-04-24 18:23:39 UTC
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.
Comment 4 Jiri Kovalsky 2002-06-19 15:51:47 UTC
Confirming in development build #200206190100 of NetBeans 3.4.