File tree Expand file tree Collapse file tree 2 files changed +5
-8
lines changed Expand file tree Collapse file tree 2 files changed +5
-8
lines changed Original file line number Diff line number Diff line change 11using System ;
22using System . Collections . Generic ;
33using System . Text . RegularExpressions ;
4- using SourceGit . Models ;
54
65namespace SourceGit . Commands
76{
@@ -49,16 +48,14 @@ protected override void OnReadline(string line)
4948 {
5049 if ( line . StartsWith ( "old mode " , StringComparison . Ordinal ) )
5150 {
52- _result . FileModeDiff ??= new FileModeDiff ( ) ;
53-
51+ _result . FileModeDiff ??= new Models . FileModeDiff ( ) ;
5452 _result . FileModeDiff . Old = line . Substring ( 9 ) ;
5553 return ;
5654 }
5755
5856 if ( line . StartsWith ( "new mode " , StringComparison . Ordinal ) )
5957 {
60- _result . FileModeDiff ??= new FileModeDiff ( ) ;
61-
58+ _result . FileModeDiff ??= new Models . FileModeDiff ( ) ;
6259 _result . FileModeDiff . New = line . Substring ( 9 ) ;
6360 return ;
6461 }
Original file line number Diff line number Diff line change @@ -531,7 +531,7 @@ public ContextMenu CreateContextMenuForUnstagedChanges(List<Models.Change> chang
531531 UseTheirs ( changes ) ;
532532 e . Handled = true ;
533533 } ;
534-
534+
535535 var useMine = new MenuItem ( ) ;
536536 useMine . Icon = App . CreateMenuIcon ( "Icons.Local" ) ;
537537 useMine . Header = App . Text ( "FileCM.UseMine" ) ;
@@ -641,15 +641,15 @@ public ContextMenu CreateContextMenuForUnstagedChanges(List<Models.Change> chang
641641 menu . Items . Add ( assumeUnchanged ) ;
642642 menu . Items . Add ( new MenuItem ( ) { Header = "-" } ) ;
643643 }
644-
644+
645645 var copy = new MenuItem ( ) ;
646646 copy . Header = App . Text ( "CopyPath" ) ;
647647 copy . Icon = App . CreateMenuIcon ( "Icons.Copy" ) ;
648648 copy . Click += ( _ , e ) =>
649649 {
650650 App . CopyText ( change . Path ) ;
651651 e . Handled = true ;
652- } ;
652+ } ;
653653 menu . Items . Add ( copy ) ;
654654 }
655655 else
You can’t perform that action at this time.
0 commit comments