How do I use Git’s `difftool` to merge conflicts?
Try git mergetool.
Try git mergetool.
In Visual Studio Code, on the left side, there is a Git icon that looks like this: By clicking on this icon, then double-clicking one of the files listed under Changes you can see the Git difference in two sides.
Since Git1.6.3, you can use the git difftool script: see my answer below. May be this article will help you. Here are the best parts: There are two different ways to specify an external diff tool. The first is the method you used, by setting the GIT_EXTERNAL_DIFF variable. However, the variable is supposed to point … Read more