[pre-commit.ci] auto fixes from pre-commit.com hooks

pre-commit-ci[bot] · pre-commit-ci[bot] · commit a0b3b2aa89a1 · 2026-03-16T21:24:46.000Z
for more information, see https://pre-commit.ci
diff --git 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)
         {

Original file line number	Diff line number	Diff line change
`@@ -324,9 +324,10 @@ void merge_subcommand::run()`
`324`	`324`	`std::cout << "Already up-to-date" << std::endl;`
`325`	`325`	`return;`
`326`	`326`	`}`
`327`		`- else if (analysis & GIT_MERGE_ANALYSIS_UNBORN`
`328`		`- \|\| (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD`
`329`		`- && !(preference & GIT_MERGE_PREFERENCE_NO_FASTFORWARD)))`
	`327`	`+ else if (`
	`328`	`+ analysis & GIT_MERGE_ANALYSIS_UNBORN`
	`329`	`+ \|\| (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD && !(preference & GIT_MERGE_PREFERENCE_NO_FASTFORWARD))`
	`330`	`+ )`
`330`	`331`	`{`
`331`	`332`	`if (analysis & GIT_MERGE_ANALYSIS_UNBORN)`
`332`	`333`	`{`