From 4fa5c3eede4def6afdbcdb8d0f8cefdb3d072ba3 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 21:22:19 +0000
Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/pre-commit/mirrors-clang-format: v21.1.2 → v22.1.1](https://github.com/pre-commit/mirrors-clang-format/compare/v21.1.2...v22.1.1)
- [github.com/astral-sh/ruff-pre-commit: v0.14.0 → v0.15.6](https://github.com/astral-sh/ruff-pre-commit/compare/v0.14.0...v0.15.6)
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index cc84447..2d1b665 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,14 +17,14 @@ repos:
         args: ['--py312-plus']
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v21.1.2
+    rev: v22.1.1
     hooks:
       - id: clang-format
         args: [--style=file]
         exclude_types: [javascript,json]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.0
+    rev: v0.15.6
     hooks:
       - id: ruff-check
         args: [--fix]

From a0b3b2aa89a1615e287456a22a4fe6cfe3bf407a Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 21:24:46 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/subcommand/merge_subcommand.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/subcommand/merge_subcommand.cpp b/src/subcommand/merge_subcommand.cpp
index c481ee3..dc4015b 100644
--- a/src/subcommand/merge_subcommand.cpp
+++ b/src/subcommand/merge_subcommand.cpp
@@ -324,9 +324,10 @@ void merge_subcommand::run()
         std::cout << "Already up-to-date" << std::endl;
         return;
     }
-    else if (analysis & GIT_MERGE_ANALYSIS_UNBORN
-             || (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD
-                 && !(preference & GIT_MERGE_PREFERENCE_NO_FASTFORWARD)))
+    else if (
+        analysis & GIT_MERGE_ANALYSIS_UNBORN
+        || (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD && !(preference & GIT_MERGE_PREFERENCE_NO_FASTFORWARD))
+    )
     {
         if (analysis & GIT_MERGE_ANALYSIS_UNBORN)
         {