Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed MPS-11082 java.lang.StackOverflowError while merge

  • Loading branch information...
commit dbf95866fee8e42b9daeb81000ddb4579d92721f 1 parent cc8c0d9
Evgeny Gerashchenko authored
View
2  core/kernel/source/jetbrains/mps/vcs/diff/changes/SetNodeChange.java
@@ -71,7 +71,7 @@ public void secondApply(SModel m) {
@Override
public List<SNodeId> getDependencies() {
- return Arrays.asList(getNodeParent(), myOldChildId);
+ return Arrays.asList(getNodeParent());
}
public SNodeId getOldChildId() {
Please sign in to comment.
Something went wrong with that request. Please try again.