Skip to content

Commit 4d31392

Browse files
lwray-renesaslove-linger
authored andcommitted
Fixed tooltip
Tooltip for chosing mine was wrong. Was --theirs when should be --ours. (cherry picked from commit 26a4719)
1 parent de31d4b commit 4d31392

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Views/Conflict.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseTheirs}" VerticalAlignment="Center"/>
112112
</StackPanel>
113113
</Button>
114-
<Button Classes="flat" Margin="8,0,0,0" Command="{Binding UseMine}" ToolTip.Tip="git checkout --theirs">
114+
<Button Classes="flat" Margin="8,0,0,0" Command="{Binding UseMine}" ToolTip.Tip="git checkout --ours">
115115
<StackPanel Orientation="Horizontal">
116116
<Path Width="12" Height="12" Data="{StaticResource Icons.Local}"/>
117117
<TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseMine}" VerticalAlignment="Center"/>

0 commit comments

Comments
 (0)