utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 07:36:27 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Update resolve conflict using p instead of k

Browse source
This commit is contained in:
Marco Zingoni 2025-10-04 09:51:55 +02:00 committed by Stefan Haller
parent f45e7ca705
commit b32b55201e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/gui/controllers/files_controller.go
View file

@ -573,7 +573,7 @@ func (self *FilesController) handleNonInlineConflict(file *models.File) error {
OnPress: func() error {
return handle(self.c.Git().WorkingTree.StageFile, self.c.Tr.Actions.ResolveConflictByKeepingFile)
},
Key: 'k',
Key: 'p',
}
deleteItem := &types.MenuItem{
Label: self.c.Tr.MergeConflictDeleteFile,