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

44 KiB

Raw Permalink Blame History

View Raw