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()
28
28
}
29
29
else if ( File . Exists ( _exec ) )
30
30
{
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 } "" ";
33
33
}
34
34
else
35
35
{
Original file line number Diff line number Diff line change @@ -29,8 +29,8 @@ public async Task<bool> OpenAsync()
29
29
}
30
30
else if ( File . Exists ( _exec ) )
31
31
{
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 } "" ";
34
34
}
35
35
else
36
36
{
Original file line number Diff line number Diff line change @@ -100,13 +100,13 @@ public override string ToString()
100
100
{
101
101
var builder = new StringBuilder ( ) ;
102
102
if ( ! string . IsNullOrEmpty ( _extra ) )
103
- builder . Append ( $ " { _extra } " ) ;
103
+ builder . Append ( _extra ) . Append ( ' ' ) ;
104
104
foreach ( var r in _revisions )
105
- builder . Append ( $ " { r } " ) ;
105
+ builder . Append ( r ) . Append ( ' ' ) ;
106
106
107
107
builder . Append ( "-- " ) ;
108
108
if ( ! string . IsNullOrEmpty ( _orgPath ) )
109
- builder . Append ( $ " { _orgPath . Quoted ( ) } " ) ;
109
+ builder . Append ( _orgPath . Quoted ( ) ) . Append ( ' ' ) ;
110
110
builder . Append ( _path . Quoted ( ) ) ;
111
111
112
112
return builder . ToString ( ) ;
You can’t perform that action at this time.
0 commit comments