Please use the Apache issue tracking system for new NetBeans issues ( !!
Bug 21190 - Create Graphical Merging Tool
Create Graphical Merging Tool
Product: utilities
Classification: Unclassified
Component: Diff
All All
: P1 (vote)
: 3.x
Assigned To: Martin Entlicher
: UI
Depends on:
Blocks: 22910
  Show dependency treegraph
Reported: 2002-03-05 15:10 UTC by Martin Entlicher
Modified: 2002-06-19 15:51 UTC (History)
0 users

See Also:
Issue Type: TASK


Note You need to log in before you can comment on or make changes to this bug.
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

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.

By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo