0

I'm trying to make p4merge works with GIT thanks to this little tutorial

I don't understand what's wrong because I've tried severals ways to do it but I can't succeed in getting a visual interface with p4merge to see the differences between files when I create a merge conflict.

By the way, I'm just using the git bash to type the commands... I don't know if it can be a mistake ?

Here what it wrotes in my .gitconfig :

[diff]
  tool = p4merge
[difftool "p4merge"]
  path = C:\\Program Files\\Perforce\\p4merge.exe
[merge]
  tool = p4merge
[mergetool "p4merge"]
  path = C:\\Program Files\\Perforce\\p4merge.exe

I'm working on Windows 7 and I just typed commands in the tutorial I gave in my post.

phd
  • 82,685
  • 13
  • 120
  • 165
Romain Rnd
  • 501
  • 1
  • 4
  • 7
  • Hi and welcome to SO :-) Do you expect us to magically guess 1) what *doesn't work* (commands typed, error message, which environment, etc.) and 2) what you've tried so far? [Help us](https://stackoverflow.com/help/how-to-ask) helping you. – Romain Valeri Aug 07 '18 at 10:43
  • Of course not but I think I wrote all of the information I have got ?! Maybe I didn't understand how it works but when I type "git mergeTool" or "git diffTool", it just doing anything to invoke p4merge visual interface :/ – Romain Rnd Aug 07 '18 at 11:03
  • Maybe give us a hint of what `git config --list` is outputting (but you did not give any of the 3 elements I suggested earlier (commands you typed, error message if any, and what's your OS/setting) – Romain Valeri Aug 07 '18 at 11:11
  • I gave informations in a new post ! :) – Romain Rnd Aug 07 '18 at 11:51
  • Editing your question would have been better, but whatever, that's more information anyway ^^ – Romain Valeri Aug 07 '18 at 12:04
  • 1
    My comment on your answer (which has been deleted and moved into your question since) was "You should start by putting double quotes around the paths, because they contain whitespace". – Romain Valeri Aug 07 '18 at 14:51

0 Answers0