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]
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)
         {