From 922c0887f11da78242482811f011c84e4e82ffc9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 1 Jan 2021 18:28:17 +0100 Subject: fix type: executable not found error when there is a merge conflict on windows --- pkg/commands/oscommands/os_windows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/commands/oscommands') 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: `\"`, -- cgit v1.2.3