mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 15:46:26 -04:00
Resolved conflicts: - commits_helper.go: combined both new imports (models + gocui) - local_commits_controller.go: kept parentIdx from HEAD and Keys/GetKeys API change from master |
||
|---|---|---|
| .. | ||
| direnv | ||
| git_commands | ||
| git_config | ||
| hosting_service | ||
| models | ||
| oscommands | ||
| patch | ||
| testdata | ||
| git.go | ||
| git_cmd_obj_builder.go | ||
| git_cmd_obj_builder_test.go | ||
| git_cmd_obj_runner.go | ||
| git_cmd_obj_runner_test.go | ||