From 87b2d52f80da70e3874ea854e93fd0febe51816c Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Fri, 10 May 2024 11:03:54 -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 9abe781d0d..e25326b636 160000
--- a/src/scripts/merge_tools/merging
+++ b/src/scripts/merge_tools/merging
@@ -1 +1 @@
-Subproject commit 9abe781d0d6604e020dffd8f958c9344c2ab9b30
+Subproject commit e25326b636f575b06bf193314c270a72794a9a45