From 973a2c9effd9395b0792b98ab02a43d77fc1c5d0 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Wed, 8 May 2024 06:58:27 -0700
Subject: [PATCH] Update merging subproject

---
 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 96a0837010..12f1ad3b8f 160000
--- a/src/scripts/merge_tools/merging
+++ b/src/scripts/merge_tools/merging
@@ -1 +1 @@
-Subproject commit 96a08370101833c4205dbe8fde48214c0a381c1e
+Subproject commit 12f1ad3b8f897bb9e5d95a3fa06d600bf8aa450f