search

kasecato / vscode-intellij-idea-keybindings

Port of IntelliJ IDEA key bindings for VS Code.
https://marketplace.visualstudio.com/items?itemName=k--kato.intellij-idea-keybindings
MIT License
817 stars 135 forks source link

Add merge-conflict #235

Closed daxmc99 closed 2 years ago

daxmc99 commented 3 years ago

Allows see next change to work in merge conflict view

kasecato commented 2 years ago

thanks