From 04cde80bb15acffda9479767a7b335f08dc443c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Lars=C3=A9n?= <slarse@kth.se>
Date: Mon, 9 Mar 2020 17:45:32 +0100
Subject: [PATCH] [misc] Update error message #43

---
 src/main/java/se/kth/spork/spoon/PcsInterpreter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/se/kth/spork/spoon/PcsInterpreter.java b/src/main/java/se/kth/spork/spoon/PcsInterpreter.java
index 042abcf3..6c482976 100644
--- 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();