From 57d382916786cf5ee237bec2b916835a1e49ca67 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 19 Sep 2024 09:21:34 -0700
Subject: [PATCH] Update submodule

---
 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 a51fc28111..7d534cf30f 160000
--- a/src/scripts/merge_tools/merging
+++ b/src/scripts/merge_tools/merging
@@ -1 +1 @@
-Subproject commit a51fc28111b2ec20535722f2c2402402ad21362a
+Subproject commit 7d534cf30fefb03962385372d7a8125ab97b3aac