From a5362e279b2455ab6b11e118a2c5686f67bc9d23 Mon Sep 17 00:00:00 2001
From: Benedikt Schesch <b.schesch@gmail.com>
Date: Sun, 26 May 2024 09:33:30 -0700
Subject: [PATCH] Added better deletion

---
 .../combined/merges_analyzer_histograms.pdf   | Bin 213437 -> 213437 bytes
 src/scripts/merge_tools/intellimerge.sh       |   1 +
 2 files changed, 1 insertion(+)

diff --git a/results/combined/merges_analyzer_histograms.pdf b/results/combined/merges_analyzer_histograms.pdf
index 2cb4af5179d1114cde59ec44a26cbfd76214d784..862318dd78cd0b4e576b9a75b175b2299596adad 100644
GIT binary patch
delta 29
kcmdnn%)7Ulx1oixg=q^jlMTD6p^=f9k->IO8|E#n0F7)2JOBUy

delta 29
kcmdnn%)7Ulx1oixg=q^jlMTCxk+HF%k@<E`8|E#n0F8tQKmY&$

diff --git a/src/scripts/merge_tools/intellimerge.sh b/src/scripts/merge_tools/intellimerge.sh
index ecdcf2b34e..95b1320992 100755
--- a/src/scripts/merge_tools/intellimerge.sh
+++ b/src/scripts/merge_tools/intellimerge.sh
@@ -63,6 +63,7 @@ if [ "$conflicts_resolved" = false ]; then
     echo "Conflict detected. Aborting the merge. Please resolve the conflicts."
     echo "All conflicting files:"
     echo "$conflict_files"
+    rm -rf $temp_out_dir $temp_intellimerge_dir
     exit 1
 fi