1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-01-26 01:41:35 +03:00
Files
lazygit/pkg
Stefan Haller 6043eb52db Revert "Update resolve conflict using p instead of k"
Now that we can use 'k' as a menu item binding (this was fixed in #5131), use it
for the "keep" entry in the merge menu. I don't think this will be a problem for
people's muscle memory, given that this menu is not encountered every day; and
it's simply the better keybinding.

This reverts commit b32b55201e.
2025-12-22 09:49:04 +01:00
..
2025-05-06 09:43:26 +02:00
2025-11-15 10:46:23 +01:00
2025-12-11 21:10:11 +01:00
2025-11-15 10:46:23 +01:00
2025-08-14 20:40:44 +02:00
2025-11-15 10:46:23 +01:00
2025-11-15 10:46:23 +01:00