All geek questions in one place

How to configure p4merge as a diff tool for Visual Studio 2015 | git

I was able to successfully connect P4Merge with TortoiseGit through this tutorial.

However, given that I spent most of my time in the IDE (Visual Studio 2015), I would also like to use this tool to use P4Merge as a comparison tool.

Previously (for example, when working with TFS), this would be enough. However, given that I am using git now, in VS there is no way to connect it this way:

enter image description here

However, I found how to configure custom tools using the command line Developer Tools Developer Tools and tf diff /configure, as in the previous tutorial with .bat files, but it seems to do nothing for me.

, , - , , , P4Merge, VS (& git), , .

+4
1

, P4Merge , .

, Git defaultetetool difftool P4Merge.

git config --global merge.tool p4merge
git config --global mergetool.p4merge.path "C:/Program Files/Perforce/p4merge.exe"
git config --global diff.tool p4merge
git config --global difftool.p4merge.path "C:/Program Files/Perforce/p4merge.exe"

, Git diffftool, p4merge.

, , , , .git/config , , diffftool .

git config --local merge.tool p4merge
git config --local mergetool.p4merge.path "C:/Program Files/Perforce/p4merge.exe"
git config --local diff.tool p4merge
git config --local difftool.p4merge.path "C:/Program Files/Perforce/p4merge.exe"
+3

Source: https://habr.com/ru/post/1655286/

More articles:


All Articles