When merging I am getting the following strange exception. Typically you get this if the java versions do not match but i checked that and this is not the case.
java.lang.UnsupportedClassVersionError: name/fraser/neil/plaintext/diff_match_patch
at de.slisson.mps.richtext.runtime.vcs.DiffPainter$1.run(Unknown Source)
at jetbrains.mps.ide.smodel.WorkbenchModelAccess$8.compute(WorkbenchModelAccess.java:307)
at jetbrains.mps.ide.smodel.WorkbenchModelAccess$8.compute(WorkbenchModelAccess.java:303)
at com.intellij.openapi.application.impl.ApplicationImpl.runReadAction(ApplicationImpl.java:888)
at jetbrains.mps.ide.smodel.WorkbenchModelAccess.tryRead(WorkbenchModelAccess.java:303)
at jetbrains.mps.ide.smodel.WorkbenchModelAccess.requireRead(WorkbenchModelAccess.java:351)
at de.slisson.mps.richtext.runtime.vcs.DiffPainter.paintUnsafe(Unknown Source)
at de.slisson.mps.richtext.runtime.vcs.DiffPainter.paint(Unknown Source)
at de.slisson.mps.editor.multiline.cells.EditorCell_Multiline.paintBackground(Unknown Source)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:583)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590)
at jetbrains.mps.nodeEditor.EditorComponent.paintComponent(EditorComponent.java:2085)
at javax.swing.JComponent.paint(JComponent.java:1037)
at jetbrains.mps.nodeEditor.EditorComponent.paint(EditorComponent.java:2427)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JComponent.paint(JComponent.java:1046)
at javax.swing.JViewport.paint(JViewport.java:795)
at com.intellij.ui.components.JBViewport.paint(JBViewport.java:60)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JComponent.paint(JComponent.java:1046)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JComponent.paint(JComponent.java:1046)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JComponent.paint(JComponent.java:1046)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JComponent.paint(JComponent.java:1046)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JSplitPane.paintChildren(JSplitPane.java:1030)
at javax.swing.JComponent.paint(JComponent.java:1046)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JComponent.paint(JComponent.java:1046)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JComponent.paint(JComponent.java:1046)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JComponent.paint(JComponent.java:1046)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JComponent.paint(JComponent.java:1046)
at javax.swing.JLayeredPane.paint(JLayeredPane.java:567)
at javax.swing.JComponent.paintChildren(JComponent.java:870)
at javax.swing.JComponent.paint(JComponent.java:1046)
at java.awt.GraphicsCallback$PaintCallback.run(GraphicsCallback.java:34)
at sun.awt.SunGraphicsCallback.runOneComponent(SunGraphicsCallback.java:60)
at sun.awt.SunGraphicsCallback.runComponents(SunGraphicsCallback.java:97)
at java.awt.Container.paint(Container.java:1791)
at java.awt.Window.paint(Window.java:3390)
at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl$MyDialog.paint(DialogWrapperPeerImpl.java:873)
at sun.awt.RepaintArea.paintComponent(RepaintArea.java:276)
at sun.awt.RepaintArea.paint(RepaintArea.java:241)
at apple.awt.ComponentModel.handleEvent(ComponentModel.java:263)
at apple.awt.CWindow.handleEvent(CWindow.java:545)
at java.awt.Component.dispatchEventImpl(Component.java:4820)
at java.awt.Container.dispatchEventImpl(Container.java:2141)
at java.awt.Window.dispatchEventImpl(Window.java:2489)
at java.awt.Component.dispatchEvent(Component.java:4572)
at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:710)
at java.awt.EventQueue.access$400(EventQueue.java:82)
at java.awt.EventQueue$2.run(EventQueue.java:669)
at java.awt.EventQueue$2.run(EventQueue.java:667)
at java.security.AccessController.doPrivileged(Native Method)
When merging I am getting the following strange exception. Typically you get this if the java versions do not match but i checked that and this is not the case.
java.lang.UnsupportedClassVersionError: name/fraser/neil/plaintext/diff_match_patch at de.slisson.mps.richtext.runtime.vcs.DiffPainter$1.run(Unknown Source) at jetbrains.mps.ide.smodel.WorkbenchModelAccess$8.compute(WorkbenchModelAccess.java:307) at jetbrains.mps.ide.smodel.WorkbenchModelAccess$8.compute(WorkbenchModelAccess.java:303) at com.intellij.openapi.application.impl.ApplicationImpl.runReadAction(ApplicationImpl.java:888) at jetbrains.mps.ide.smodel.WorkbenchModelAccess.tryRead(WorkbenchModelAccess.java:303) at jetbrains.mps.ide.smodel.WorkbenchModelAccess.requireRead(WorkbenchModelAccess.java:351) at de.slisson.mps.richtext.runtime.vcs.DiffPainter.paintUnsafe(Unknown Source) at de.slisson.mps.richtext.runtime.vcs.DiffPainter.paint(Unknown Source) at de.slisson.mps.editor.multiline.cells.EditorCell_Multiline.paintBackground(Unknown Source) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:583) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.cells.EditorCell_Collection.paint(EditorCell_Collection.java:590) at jetbrains.mps.nodeEditor.EditorComponent.paintComponent(EditorComponent.java:2085) at javax.swing.JComponent.paint(JComponent.java:1037) at jetbrains.mps.nodeEditor.EditorComponent.paint(EditorComponent.java:2427) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JComponent.paint(JComponent.java:1046) at javax.swing.JViewport.paint(JViewport.java:795) at com.intellij.ui.components.JBViewport.paint(JBViewport.java:60) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JComponent.paint(JComponent.java:1046) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JComponent.paint(JComponent.java:1046) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JComponent.paint(JComponent.java:1046) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JComponent.paint(JComponent.java:1046) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JSplitPane.paintChildren(JSplitPane.java:1030) at javax.swing.JComponent.paint(JComponent.java:1046) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JComponent.paint(JComponent.java:1046) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JComponent.paint(JComponent.java:1046) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JComponent.paint(JComponent.java:1046) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JComponent.paint(JComponent.java:1046) at javax.swing.JLayeredPane.paint(JLayeredPane.java:567) at javax.swing.JComponent.paintChildren(JComponent.java:870) at javax.swing.JComponent.paint(JComponent.java:1046) at java.awt.GraphicsCallback$PaintCallback.run(GraphicsCallback.java:34) at sun.awt.SunGraphicsCallback.runOneComponent(SunGraphicsCallback.java:60) at sun.awt.SunGraphicsCallback.runComponents(SunGraphicsCallback.java:97) at java.awt.Container.paint(Container.java:1791) at java.awt.Window.paint(Window.java:3390) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl$MyDialog.paint(DialogWrapperPeerImpl.java:873) at sun.awt.RepaintArea.paintComponent(RepaintArea.java:276) at sun.awt.RepaintArea.paint(RepaintArea.java:241) at apple.awt.ComponentModel.handleEvent(ComponentModel.java:263) at apple.awt.CWindow.handleEvent(CWindow.java:545) at java.awt.Component.dispatchEventImpl(Component.java:4820) at java.awt.Container.dispatchEventImpl(Container.java:2141) at java.awt.Window.dispatchEventImpl(Window.java:2489) at java.awt.Component.dispatchEvent(Component.java:4572) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:710) at java.awt.EventQueue.access$400(EventQueue.java:82) at java.awt.EventQueue$2.run(EventQueue.java:669) at java.awt.EventQueue$2.run(EventQueue.java:667) at java.security.AccessController.doPrivileged(Native Method)