Skip to content

Change keybinding of "keep" item in Merge Conflict menu back to 'k' #5132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefanhaller merged 1 commit into from
Dec 22, 2025
+1 −1

Revert "Update resolve conflict using p instead of k"

6043eb5
Select commit
Loading
Failed to load commit list.
Merged

Change keybinding of "keep" item in Merge Conflict menu back to 'k' #5132

Revert "Update resolve conflict using p instead of k"
6043eb5
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar