I just attempted to merge a file after updating from CVS.  There were 4 
unresolved conflicts.  I resolved the conflicts successfully and then clicked 
the Save button, which resulted in the exception below.  I can't get past
this error to save the file, so I'm pretty out of luck on the merge.  Seems 
like pretty important functionality...

I can't past the source code here, but if it helps, the "left" pane has 85 
lines, the "right" pane has 74 lines, and the "Results after merge" pane has 
76 lines.  So it seems like it's trying to use information from the left pane 
but dealing with the right or merged (smaller) panes.

java.lang.IndexOutOfBoundsException: Invalid line index=82 >= lineCount=77
	at org.netbeans.editor.LineRootElement.getElement
(LineRootElement.java:85)
	at org.openide.text.NbDocument$DocumentRenderer.run
(NbDocument.java:673)
	at org.netbeans.editor.BaseDocument.render(BaseDocument.java:1126)
	at org.openide.text.NbDocument$DocumentRenderer.renderToInt
(NbDocument.java:649)
	at org.openide.text.NbDocument.findLineOffset(NbDocument.java:153)
	at org.netbeans.modules.merge.builtin.visualizer.MergePanel.writeResult
(MergePanel.java:1435)
	at 
org.netbeans.modules.merge.builtin.visualizer.MergeControl.vetoableChange
(MergeControl.java:332)
	at org.openide.util.WeakListenerImpl$VetoableChange.vetoableChange
(WeakListenerImpl.java:177)
	at java.beans.VetoableChangeSupport.fireVetoableChange
(VetoableChangeSupport.java:334)
	at java.beans.VetoableChangeSupport.fireVetoableChange
(VetoableChangeSupport.java:251)
	at javax.swing.JComponent.fireVetoableChange(JComponent.java:4444)
	at 
org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent.access$600
(MergeDialogComponent.java:59)
	at 
org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent$MergeNode.sa
ve(MergeDialogComponent.java:447)
	at 
org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent.okButtonActi
onPerformed(MergeDialogComponent.java:210)
	at 
org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent.access$000
(MergeDialogComponent.java:59)
	at 
org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent$1.actionPerf
ormed(MergeDialogComponent.java:117)
	at javax.swing.AbstractButton.fireActionPerformed
(AbstractButton.java:1957)
	at javax.swing.AbstractButton$Handler.actionPerformed
(AbstractButton.java:2278)
	at javax.swing.DefaultButtonModel.fireActionPerformed
(DefaultButtonModel.java:377)
	at javax.swing.DefaultButtonModel.setPressed
(DefaultButtonModel.java:232)
	at javax.swing.plaf.basic.BasicButtonListener.mouseReleased
(BasicButtonListener.java:234)
	at java.awt.AWTEventMulticaster.mouseReleased
(AWTEventMulticaster.java:231)
	at java.awt.Component.processMouseEvent(Component.java:5955)
	at javax.swing.JComponent.processMouseEvent(JComponent.java:3285)
	at java.awt.Component.processEvent(Component.java:5720)
	at java.awt.Container.processEvent(Container.java:1960)
	at java.awt.Component.dispatchEventImpl(Component.java:4365)
	at java.awt.Container.dispatchEventImpl(Container.java:2018)
	at java.awt.Component.dispatchEvent(Component.java:4195)
	at java.awt.LightweightDispatcher.retargetMouseEvent
(Container.java:4222)
	at java.awt.LightweightDispatcher.processMouseEvent
(Container.java:3886)
	at java.awt.LightweightDispatcher.dispatchEvent(Container.java:3816)
	at java.awt.Container.dispatchEventImpl(Container.java:2004)
	at java.awt.Window.dispatchEventImpl(Window.java:2210)
	at java.awt.Component.dispatchEvent(Component.java:4195)
[catch] at java.awt.EventQueue.dispatchEvent(EventQueue.java:599)
	at java.awt.EventDispatchThread.pumpOneEventForFilters
(EventDispatchThread.java:273)
	at java.awt.EventDispatchThread.pumpEventsForFilter
(EventDispatchThread.java:183)
	at java.awt.EventDispatchThread.pumpEventsForHierarchy
(EventDispatchThread.java:173)
	at java.awt.EventDispatchThread.pumpEvents
(EventDispatchThread.java:168)
	at java.awt.EventDispatchThread.pumpEvents
(EventDispatchThread.java:160)
	at java.awt.EventDispatchThread.run(EventDispatchThread.java:121)