diff options
| author | unknown <murphy66@gmail.com> | 2021-01-01 18:28:17 +0100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-01-01 13:17:29 -0800 |
| commit | 922c0887f11da78242482811f011c84e4e82ffc9 (patch) | |
| tree | 5723caae0d09d9d46e1160935b7614c052d3edd9 /pkg/commands/oscommands | |
| parent | d7c9243880b973c137378569dec7d408b695f36f (diff) | |
fix type: executable not found error when there is a merge conflict on windows
Diffstat (limited to 'pkg/commands/oscommands')
| -rw-r--r-- | pkg/commands/oscommands/os_windows.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/commands/oscommands/os_windows.go b/pkg/commands/oscommands/os_windows.go index 7cbe5bc47..3f4f7e5a1 100644 --- a/pkg/commands/oscommands/os_windows.go +++ b/pkg/commands/oscommands/os_windows.go @@ -3,7 +3,7 @@ package oscommands func getPlatform() *Platform { return &Platform{ OS: "windows", - CatCmd: "type", + CatCmd: "cmd /c type", Shell: "cmd", ShellArg: "/c", EscapedQuote: `\"`, |