From 8e2ff27b81b5500349b36ac5fffb23a22bb65a99 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Sat, 21 Sep 2024 19:56:22 -0700
Subject: [PATCH] Newer plume-lib merging

---
 src/scripts/merge_tools/merging | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/merge_tools/merging b/src/scripts/merge_tools/merging
index dfa28f8954..54b3dccf20 160000
--- a/src/scripts/merge_tools/merging
+++ b/src/scripts/merge_tools/merging
@@ -1 +1 @@
-Subproject commit dfa28f8954956fb952805cc1fb628287475a855a
+Subproject commit 54b3dccf20f8baba0e63679babb1edf363b24f2d