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 39958 - Closing Merge Conflict Resolver vs. Cancel button in Question dialog
Summary: Closing Merge Conflict Resolver vs. Cancel button in Question dialog
Status: RESOLVED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 3.x
Hardware: PC Windows ME/2000
: P4 blocker (vote)
Assignee: Martin Entlicher
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-02-11 13:31 UTC by David Kaspar
Modified: 2005-02-14 11:11 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description David Kaspar 2004-02-11 13:31:07 UTC 
How to reproduce:
1) Have a file with conflicts in CVS FS
2) Invoke "Resolve Conflicts" popup menu action in
editor of this file
3) NOTE - Merge Conflict Resolver dialog appears
4) Press OK button
5) NOTE - Question dialog appears
6) ERROR - There are Yes, No, and Cancel button.
No and Cancel buttons have the same functionality
-> remove Cancel button.
Comment 1 Martin Entlicher 2005-02-14 11:08:22 UTC 
This is in diff module.
Comment 2 Martin Entlicher 2005-02-14 11:11:17 UTC 
Fixed in trunk:

/cvs/diff/src/org/netbeans/modules/merge/builtin/visualizer/MergeDialogComponent.java,v
 <--  MergeDialogComponent.java
new revision: 1.23; previous revision: 1.22