20 lines
1.2 KiB
XML
20 lines
1.2 KiB
XML
<UserControl xmlns="https://github.com/avaloniaui"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
xmlns:vm="clr-namespace:Flawless.Client.ViewModels.ModalBox"
|
|
xmlns:u="https://irihi.tech/ursa"
|
|
x:DataType="vm:MergeDialogViewModel"
|
|
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
|
MinWidth="600"
|
|
x:Class="Flawless.Client.Views.ModalBox.MergeDialogView">
|
|
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" Spacing="12">
|
|
<Label Content="{Binding Ws, StringFormat='Conflict on file:\n {0}'}"/>
|
|
<Label Content="{Binding Ws, StringFormat='Left is local and right is remote'}"/>
|
|
<StackPanel Orientation="Horizontal" Spacing="4" HorizontalAlignment="Center">
|
|
<Button Content="Use Left" Command="{Binding UseLeftFileCommand}"/>
|
|
<Button Content="Merge" Command="{Binding RaiseMergeToolsCommand}"/>
|
|
<Button Content="Use Right" Command="{Binding UseRightFileCommand}"/>
|
|
</StackPanel>
|
|
</StackPanel>
|
|
</UserControl> |