mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move merge conflicts code into controller

Browse source
This commit is contained in:
Jesse Duffield 2022-08-06 18:50:52 +10:00
parent 445a625b56
commit 7410acd1aa
39 changed files with 682 additions and 652 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkg/commands/oscommands/cmd_obj_runner_win.go
View file

@ -7,7 +7,8 @@ import (
"bytes"
"io"
"os/exec"
"sync"
"github.com/sasha-s/go-deadlock"
)
type Buffer struct {