1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-12 11:15:00 +02:00

fix type: executable not found error when there is a merge conflict on windows

This commit is contained in:
unknown 2021-01-01 18:28:17 +01:00 committed by Jesse Duffield
parent d7c9243880
commit 922c0887f1

View File

@ -3,7 +3,7 @@ package oscommands
func getPlatform() *Platform { func getPlatform() *Platform {
return &Platform{ return &Platform{
OS: "windows", OS: "windows",
CatCmd: "type", CatCmd: "cmd /c type",
Shell: "cmd", Shell: "cmd",
ShellArg: "/c", ShellArg: "/c",
EscapedQuote: `\"`, EscapedQuote: `\"`,