GitHub repository: pprice/vscode-better-merge
Primary language: TypeScript
Created: 2016-11-26T00:52:03Z
Description: Better merge conflict support for vscode