microsoft / vscode

Visual Studio Code
https://code.visualstudio.com
MIT License
164.99k stars 29.53k forks source link

Get vscode into Git's builtin diff & merge tools #74304

Closed AnthonyMastrean closed 5 years ago

AnthonyMastrean commented 5 years ago

Did you know that Git supports built-in diff & merge tools?! If you're using a supported tool, you don't have to muck around on the command line or in a global .gitconfig or on Stack Overflow looking for the correct command-line arguments.

Someone should put together a script and get a PR going to the Git repo.

https://github.com/git/git/tree/master/mergetools

miggs125 commented 5 years ago

I would like to take this issue

vscodebot[bot] commented 5 years ago

This issue is being closed to keep the number of issues in our inbox on a manageable level, we are closing issues that are not going to be addressed in the foreseeable future: We look at the number of votes the issue has received and the number of duplicate issues filed. More details here. If you disagree and feel that this issue is crucial: We are happy to listen and to reconsider.

If you wonder what we are up to, please see our roadmap and issue reporting guidelines.

Thanks for your understanding and happy coding!