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.
Build: NetBeans IDE Dev (Build 20130917-91f6216db8a1) VM: Java HotSpot(TM) 64-Bit Server VM, 23.25-b01, Java(TM) SE Runtime Environment, 1.7.0_25-b15 OS: Linux User Comments: janario: . janario: . janario: Using git Accept Both in conflict Stacktrace: java.lang.ArrayIndexOutOfBoundsException at java.lang.System.arraycopy(System.java:0) at org.netbeans.modules.merge.builtin.visualizer.MergePanel.replace(MergePanel.java:1394) at org.netbeans.modules.merge.builtin.visualizer.MergePanel.replaceBothInResult(MergePanel.java:1263) at org.netbeans.modules.merge.builtin.visualizer.MergeControl.doAcceptBoth(MergeControl.java:377) at org.netbeans.modules.merge.builtin.visualizer.MergeControl.actionPerformed(MergeControl.java:417) at org.netbeans.modules.merge.builtin.visualizer.MergePanel.fireControlActionCommand(MergePanel.java:562)
Created attachment 140177 [details] stacktrace
fixing hopefully fix: http://hg.netbeans.org/core-main/rev/a9451bf593c6