Skip to content

Commit 6620bd1

Browse files
committed
ux: remove tooltip for USE THEIRS and USE MINE button
Signed-off-by: leo <[email protected]>
1 parent 26307e2 commit 6620bd1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Views/Conflict.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@
113113
</Border>
114114

115115
<StackPanel Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center">
116-
<Button Classes="flat" Margin="0,0,0,0" Command="{Binding UseTheirs}" ToolTip.Tip="git checkout --theirs">
116+
<Button Classes="flat" Margin="0,0,0,0" Command="{Binding UseTheirs}">
117117
<StackPanel Orientation="Horizontal">
118118
<Path Width="12" Height="12" Data="{StaticResource Icons.Incoming}"/>
119119
<TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseTheirs}" VerticalAlignment="Center"/>
120120
</StackPanel>
121121
</Button>
122-
<Button Classes="flat" Margin="8,0,0,0" Command="{Binding UseMine}" ToolTip.Tip="git checkout --ours">
122+
<Button Classes="flat" Margin="8,0,0,0" Command="{Binding UseMine}">
123123
<StackPanel Orientation="Horizontal">
124124
<Path Width="12" Height="12" Data="{StaticResource Icons.Local}"/>
125125
<TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseMine}" VerticalAlignment="Center"/>

0 commit comments

Comments
 (0)