File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed
eng/common/scripts/Helpers Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -65,8 +65,9 @@ class ConflictedFile {
65
65
# powershell ignores the newlines with and without --textconv, which results in a json file without original spacing.
66
66
# by forcefully reading into the array line by line, the whitespace is preserved. we're relying on gits autoconverstion of clrf to lf
67
67
# to ensure that the line endings are consistent.
68
- Write-Host " git show $ ( $this.LeftSource ) :$ ( $this.Path ) "
69
- $tempContent = git show (" $ ( $this.LeftSource ) :$ ( $this.Path ) " )
68
+ $toShow = " $ ( $this.LeftSource ) :$ ( $this.Path ) " -replace " \\" , " /"
69
+ Write-Host " git show $toShow "
70
+ $tempContent = git show $toShow
70
71
return $tempContent -split " `r ?`n "
71
72
}
72
73
else {
@@ -76,8 +77,9 @@ class ConflictedFile {
76
77
77
78
[array ] Right(){
78
79
if ($this.IsConflicted ) {
79
- Write-Host " git show $ ( $this.RightSource ) :$ ( $this.Path ) "
80
- $tempContent = git show (" $ ( $this.RightSource ) :$ ( $this.Path ) " )
80
+ $toShow = " $ ( $this.RightSource ) :$ ( $this.Path ) " -replace " \\" , " /"
81
+ Write-Host " git show $toShow "
82
+ $tempContent = git show $toShow
81
83
return $tempContent -split " `r ?`n "
82
84
}
83
85
else {
You can’t perform that action at this time.
0 commit comments