#

conflict-blocks

Here is 1 public repository matching this topic...

pprice / vscode-better-merge

Better merge conflict support for vscode

merge-conflicts extension vscode conflict-blocks

Updated Aug 28, 2017
TypeScript

Improve this page

Add a description, image, and links to the conflict-blocks topic page so that developers can more easily learn about it.

Curate this topic

Add this topic to your repo

To associate your repository with the conflict-blocks topic, visit your repo's landing page and select "manage topics."