p4merge tool configuration with git

Asked May 31 '17 at 07:28

Active May 31 '17 at 07:28

Viewed 223 times

I just configured gittool p4merge on my client server. When I do git mergetool, I get the pop-up for meld instead of p4merge:

{local}: modified file {remote}: modified file Hit return to start merge resolution tool (meld):

I checked git config file and meld id not configured in .gitconfig.

My .gitconfig file contents are:

[merge]
tool = p4merge
[mergetool]
keepBackup = false
[mergetool "p4merge"]
path = /usr/bin/p4merge

Why its picking meld instead of p4merge. Can someone suggest why it’s happening??

asked May 31 '17 at 07:28

skm_satish

Perhaps it is configured in your repository instead? Do a `git config --list --show-origin` – Lasse V. Karlsen May 31 '17 at 08:41
I dont see this --show-origin option in the command: git config --list --show-origin error: unknown option `show-origin' usage: git config [options] – skm_satish May 31 '17 at 09:32
Which version of `git` ? – Lasse V. Karlsen May 31 '17 at 09:32
git version 2.1.0 – skm_satish May 31 '17 at 09:33
OK, then I don't know, inspect the configuration files below `.git` perhaps? You should consider updating. Git 2.1.0 is almost 3 years old. – Lasse V. Karlsen May 31 '17 at 09:35

0 Answers0