diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-06 18:50:52 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-07 11:16:03 +1000 |
| commit | 7410acd1aaa97f678295a328264360802346b33a (patch) | |
| tree | 51dc6b5dfc8c0b67711ff644a6bc32480e6eaea8 /pkg/commands | |
| parent | 445a625b56a79be6cee7ec1ee35fe9f4fcc2daad (diff) | |
move merge conflicts code into controller
Diffstat (limited to 'pkg/commands')
| -rw-r--r-- | pkg/commands/oscommands/cmd_obj_runner_win.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/commands/oscommands/cmd_obj_runner_win.go b/pkg/commands/oscommands/cmd_obj_runner_win.go index 9a64dfa77..e4098ddc9 100644 --- a/pkg/commands/oscommands/cmd_obj_runner_win.go +++ b/pkg/commands/oscommands/cmd_obj_runner_win.go @@ -7,7 +7,8 @@ import ( "bytes" "io" "os/exec" - "sync" + + "github.com/sasha-s/go-deadlock" ) type Buffer struct { |