diff --git a/src/scripts/merge_tools/merging b/src/scripts/merge_tools/merging index c428ba2e2b..1f77db72ae 160000 --- a/src/scripts/merge_tools/merging +++ b/src/scripts/merge_tools/merging @@ -1 +1 @@ -Subproject commit c428ba2e2b8510cf22fffb6f24d21fdb719f339b +Subproject commit 1f77db72ae999957a1725ca87be8c0c2f97225e4