From 9345242a53ac32f3d15690c0eab43368b4411c55 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Fri, 7 Jun 2024 17:28:11 -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 242283f32e..b636e7c829 160000
--- a/src/scripts/merge_tools/merging
+++ b/src/scripts/merge_tools/merging
@@ -1 +1 @@
-Subproject commit 242283f32e19424ddef3de5b49939ed1bef9a6fe
+Subproject commit b636e7c82930df750a324c20ce8f99610cc2751b