From 2cef09dfd6b609d7fa982e5ba939850920719c41 Mon Sep 17 00:00:00 2001 From: MaPePeR Date: Tue, 18 Nov 2025 11:48:46 +0100 Subject: [PATCH] Also fix indentation if no conflicts occurred --- bin/composer-git-merge-driver | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/composer-git-merge-driver b/bin/composer-git-merge-driver index 17b8c44..180455b 100755 --- a/bin/composer-git-merge-driver +++ b/bin/composer-git-merge-driver @@ -226,13 +226,13 @@ if (count($conflicts)) { $parts[] = str_repeat('>', $markerLen); return implode("\n", $parts); }, $merged); +} - // fix the indentation per the user's preference - if ($indentation !== $defaultIndentation) { - $merged = preg_replace_callback("/^(?:{$defaultIndentation})+/m", function($matches) use ($indentation) { - return str_repeat($indentation, strlen($matches[0]) / 4); - }, $merged); - } +// fix the indentation per the user's preference +if ($indentation !== $defaultIndentation) { + $merged = preg_replace_callback("/^(?:{$defaultIndentation})+/m", function($matches) use ($indentation) { + return str_repeat($indentation, strlen($matches[0]) / 4); + }, $merged); } // update the file