diff --git a/src/Commands/Diff.cs b/src/Commands/Diff.cs index 4984e3db..3846e4bb 100644 --- a/src/Commands/Diff.cs +++ b/src/Commands/Diff.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Text.RegularExpressions; -using SourceGit.Models; namespace SourceGit.Commands { @@ -49,16 +48,14 @@ namespace SourceGit.Commands { if (line.StartsWith("old mode ", StringComparison.Ordinal)) { - _result.FileModeDiff ??= new FileModeDiff(); - + _result.FileModeDiff ??= new Models.FileModeDiff(); _result.FileModeDiff.Old = line.Substring(9); return; } if (line.StartsWith("new mode ", StringComparison.Ordinal)) { - _result.FileModeDiff ??= new FileModeDiff(); - + _result.FileModeDiff ??= new Models.FileModeDiff(); _result.FileModeDiff.New = line.Substring(9); return; } diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs index 83cff278..2a158242 100644 --- a/src/ViewModels/WorkingCopy.cs +++ b/src/ViewModels/WorkingCopy.cs @@ -531,7 +531,7 @@ namespace SourceGit.ViewModels UseTheirs(changes); e.Handled = true; }; - + var useMine = new MenuItem(); useMine.Icon = App.CreateMenuIcon("Icons.Local"); useMine.Header = App.Text("FileCM.UseMine"); @@ -641,7 +641,7 @@ namespace SourceGit.ViewModels menu.Items.Add(assumeUnchanged); menu.Items.Add(new MenuItem() { Header = "-" }); } - + var copy = new MenuItem(); copy.Header = App.Text("CopyPath"); copy.Icon = App.CreateMenuIcon("Icons.Copy"); @@ -649,7 +649,7 @@ namespace SourceGit.ViewModels { App.CopyText(change.Path); e.Handled = true; - }; + }; menu.Items.Add(copy); } else