From 4d313920853e64d136f5da56f07ca83a52e8bc7f Mon Sep 17 00:00:00 2001
From: lwray-renesas <82612797+lwray-renesas@users.noreply.github.com>
Date: Thu, 17 Apr 2025 17:14:52 +0100
Subject: [PATCH] Fixed tooltip

Tooltip for chosing mine was wrong.
Was --theirs when should be --ours.

(cherry picked from commit 26a471933c21a135e946273d49b9135b401bbd7f)
---
 src/Views/Conflict.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/Conflict.axaml b/src/Views/Conflict.axaml
index f2d7bdec..cf2e25a0 100644
--- a/src/Views/Conflict.axaml
+++ b/src/Views/Conflict.axaml
@@ -111,7 +111,7 @@
               <TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseTheirs}" VerticalAlignment="Center"/>
             </StackPanel>
           </Button>
-          <Button Classes="flat" Margin="8,0,0,0" Command="{Binding UseMine}" ToolTip.Tip="git checkout --theirs">
+          <Button Classes="flat" Margin="8,0,0,0" Command="{Binding UseMine}" ToolTip.Tip="git checkout --ours">
             <StackPanel Orientation="Horizontal">
               <Path Width="12" Height="12" Data="{StaticResource Icons.Local}"/>
               <TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseMine}" VerticalAlignment="Center"/>