File tree Expand file tree Collapse file tree 3 files changed +7
-7
lines changed
Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -28,8 +28,8 @@ public void Open()
2828 }
2929 else if ( File . Exists ( _exec ) )
3030 {
31- var cmd = $ "{ _exec . Quoted ( ) } { _merger . DiffCmd } ";
32- Args = $ "-c difftool.sourcegit.cmd={ cmd . Quoted ( ) } difftool --tool=sourcegit --no-prompt { _option } ";
31+ var cmd = $ """ \" { _exec } \" { _merger . DiffCmd } "" ";
32+ Args = $ """ -c difftool.sourcegit.cmd=" { cmd } " difftool --tool=sourcegit --no-prompt { _option } "" ";
3333 }
3434 else
3535 {
Original file line number Diff line number Diff line change @@ -29,8 +29,8 @@ public async Task<bool> OpenAsync()
2929 }
3030 else if ( File . Exists ( _exec ) )
3131 {
32- var cmd = $ "{ _exec . Quoted ( ) } { _merger . Cmd } ";
33- Args = $ "-c mergetool.sourcegit.cmd={ cmd . Quoted ( ) } -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit { _file } ";
32+ var cmd = $ """ \" { _exec } \" { _merger . Cmd } "" ";
33+ Args = $ """ -c mergetool.sourcegit.cmd=" { cmd } " -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit { _file } "" ";
3434 }
3535 else
3636 {
Original file line number Diff line number Diff line change @@ -100,13 +100,13 @@ public override string ToString()
100100 {
101101 var builder = new StringBuilder ( ) ;
102102 if ( ! string . IsNullOrEmpty ( _extra ) )
103- builder . Append ( $ " { _extra } " ) ;
103+ builder . Append ( _extra ) . Append ( ' ' ) ;
104104 foreach ( var r in _revisions )
105- builder . Append ( $ " { r } " ) ;
105+ builder . Append ( r ) . Append ( ' ' ) ;
106106
107107 builder . Append ( "-- " ) ;
108108 if ( ! string . IsNullOrEmpty ( _orgPath ) )
109- builder . Append ( $ " { _orgPath . Quoted ( ) } " ) ;
109+ builder . Append ( _orgPath . Quoted ( ) ) . Append ( ' ' ) ;
110110 builder . Append ( _path . Quoted ( ) ) ;
111111
112112 return builder . ToString ( ) ;
You can’t perform that action at this time.
0 commit comments