- Install p4merge
git config -e
orgit config --global -e
- Add the following to the config file.
[diff]
tool = p4
[difftool "p4"]
cmd = \"/Applications/p4merge.app/Contents/Resources/launchp4merge\" \"$LOCAL\" \"$REMOTE\"
public static class StringFormatHelper | |
{ | |
#region Value | |
public static DependencyProperty ValueProperty = DependencyProperty.RegisterAttached( | |
"Value", typeof(object), typeof(StringFormatHelper), new System.Windows.PropertyMetadata(null, OnValueChanged)); | |
private static void OnValueChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args) | |
{ | |
RefreshFormattedValue(obj); |
// This class helps reduce the amount of code in each test. | |
private class TestHelper | |
{ | |
private DateTime StartTime; | |
private Enums.MetricStorageInterval DataGranularity; | |
private List<ceQryDashboardGadgetDataBO> Data1; | |
private List<ceQryDashboardGadgetDataBO> Data2; | |
private List<ExpectedResult> ExpectedResults; |
<UserControl | |
x:Class="PieChartTest.MainPage" | |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | |
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:caCommon="clr-namespace:ComponentArt.Silverlight.DataVisualization.Common;assembly=ComponentArt.Silverlight.DataVisualization.Common" | |
xmlns:caCharting="clr-namespace:ComponentArt.Silverlight.DataVisualization.Charting;assembly=ComponentArt.Silverlight.DataVisualization.Charting" | |
xmlns:my="clr-namespace:PieChartTest" | |
mc:Ignorable="d" |
git config -e
or git config --global -e
[diff]
tool = p4
[difftool "p4"]
cmd = \"/Applications/p4merge.app/Contents/Resources/launchp4merge\" \"$LOCAL\" \"$REMOTE\"