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.
Bind the undo and redo actions from the main window with the graphical merge tool so that the user will be able to "unresolve" a conflict.
Set target milestone to TBD