feat(ui): add Merge button to DiffModal

2026-04-22 09:53:11 +02:00
parent c911717a3b
commit 1bc7fcc609
1 changed files with 9 additions and 6 deletions
--- 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>