[misc] Update error message #43

ASSERT-KTH · Mar 9, 2020 · 04cde80 · 04cde80
1 parent 18e4f98
commit 04cde80
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/se/kth/spork/spoon/PcsInterpreter.java b/src/main/java/se/kth/spork/spoon/PcsInterpreter.java
@@ -440,7 +440,7 @@ private void setContent(CtElement mergeTree, SpoonNode originalTree) {
             Set<Content<SpoonNode, RoledValues>> nodeContents = contents.get(originalTree);
 
             if (nodeContents.size() != 1) {
-                throw new IllegalStateException("UNHANDLED CONFLICT");
+                throw new IllegalStateException("Internal error, unhandled conflict: " + nodeContents);
             } else {
                 RoledValues rvs = nodeContents.iterator().next().getValue();