Lazygit: Merge Conflict panel exec: "type": executable file not found in %PATH%

[MikeVensel]

Describe the bug
The merge conflicts panel displays an error saying, "exec: "type": executable file not found in %PATH%," rather than the merge conflict.

To Reproduce
Steps to reproduce the behavior:

1. Run a rebase that will produce a conflict.
2. Go to the files panel

Expected behavior
I would expect to see a typically conflict diff in the merge conflicts panel.

Screenshots
If applicable, add screenshots to help explain your problem.

Desktop (please complete the following information):

• OS: Windows 10
• Lazygit Version v0.20.4

Additional context
Honestly this may just be something wrong in my environment but I am able to run the command type test.txt in cmd, in PowerShell with the command cmd /c type test.txt and in PowerShell directly with type test.txt. I am also able to run the command in the custom commands prompt in lazygit as well. I am able to open the file in VS Code and resolve the conflict but lazygit does not allow me to stage the file.

[rgwood]

I have the same issue on Windows 10 and lazygit 0.23.2. Also if I hit space on the offending file in the files pane I get a crash:

panic: runtime error: index out of range [0] with length 0                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            goroutine 1 [running]:
github.com/jesseduffield/lazygit/pkg/gui.(*Gui).handlePickHunk(0xc00036a780, 0xc0002dad80, 0xc000470000, 0x1, 0xc0000879f0)                                                                                                                                                                                /home/runner/work/lazygit/lazygit/pkg/gui/merge_panel.go:177 +0x1da
github.com/jesseduffield/gocui.(*Gui).execKeybinding(...)                                                                                                                                                                                                                                                  /home/runner/work/lazygit/lazygit/vendor/github.com/jesseduffield/gocui/gui.go:963
github.com/jesseduffield/gocui.(*Gui).execKeybindings(0xc0002dad80, 0xc000470000, 0xc00061a540, 0x48, 0x58, 0xc00061a540)                                                                                                                                                                                  /home/runner/work/lazygit/lazygit/vendor/github.com/jesseduffield/gocui/gui.go:943 +0x1ac
github.com/jesseduffield/gocui.(*Gui).onKey(0xc0002dad80, 0xc00061a540, 0xb1f040, 0xc00008c201)                                                                                                                                                                                                            /home/runner/work/lazygit/lazygit/vendor/github.com/jesseduffield/gocui/gui.go:863 +0x2b9
github.com/jesseduffield/gocui.(*Gui).handleEvent(0xc0002dad80, 0xc00061a540, 0x3, 0x0)                                                                                                                                                                                                                    /home/runner/work/lazygit/lazygit/vendor/github.com/jesseduffield/gocui/gui.go:551 +0x4d
github.com/jesseduffield/gocui.(*Gui).MainLoop(0xc0002dad80, 0xc000000004, 0xc0002cda98)                                                                                                                                                                                                                   /home/runner/work/lazygit/lazygit/vendor/github.com/jesseduffield/gocui/gui.go:499 +0x402
github.com/jesseduffield/lazygit/pkg/gui.(*Gui).Run(0xc00036a780, 0x0, 0x0)                                                                                                                                                                                                                                /home/runner/work/lazygit/lazygit/pkg/gui/gui.go:489 +0x4e9
github.com/jesseduffield/lazygit/pkg/gui.(*Gui).RunWithSubprocesses(0xc00036a780, 0x0, 0xb4a008)                                                                                                                                                                                                           /home/runner/work/lazygit/lazygit/pkg/gui/gui.go:502 +0x10b
github.com/jesseduffield/lazygit/pkg/app.(*App).Run(0xc0002bc070, 0xc0001d86c0, 0x0)                                                                                                                                                                                                                       /home/runner/work/lazygit/lazygit/pkg/app/app.go:230 +0x72
main.main()                                                                                                                                                                                                                                                                                                /home/runner/work/lazygit/lazygit/main.go:126 +0xb34

[murphy66]

I think #1133 solves this issue (I should've linked the pull request before, sorry).