From 1bc7fcc6092392f41de0d1b269312030e183f270 Mon Sep 17 00:00:00 2001
From: Mika Kuns <mika.kuns@fb-tuning.de>
Date: Wed, 22 Apr 2026 09:53:11 +0200
Subject: [PATCH] feat(ui): add Merge button to DiffModal

---
 src/ClaudeDo.Ui/Views/Modals/DiffModalView.axaml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/ClaudeDo.Ui/Views/Modals/DiffModalView.axaml b/src/ClaudeDo.Ui/Views/Modals/DiffModalView.axaml
index dd772aa..6a2c96d 100644
--- a/src/ClaudeDo.Ui/Views/Modals/DiffModalView.axaml
+++ b/src/ClaudeDo.Ui/Views/Modals/DiffModalView.axaml
@@ -63,12 +63,15 @@
                      FontFamily="{StaticResource MonoFamily}"
                      FontSize="12"
                      Foreground="{StaticResource TextDimBrush}"/>
-          <Button Grid.Column="1"
-                  Classes="icon-btn"
-                  Content="✕"
-                  FontSize="12"
-                  Command="{Binding CloseCommand}"
-                  VerticalAlignment="Center"/>
+          <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">
+            <Button Content="Merge…"
+                    Command="{Binding MergeCommand}"
+                    Margin="0,0,4,0" />
+            <Button Classes="icon-btn"
+                    Content="✕"
+                    FontSize="12"
+                    Command="{Binding CloseCommand}" />
+          </StackPanel>
         </Grid>
       </Border>