I want to change my git mergetool kdiff3 to p4merge. because I'm getting an error on my windows system using kdiff3 mergetool.
/mingw32/libexec/git-core/git-mergetool--lib: line 128: C:\Program Files\KDiff3\kdiff3: cannot execute binary file: Exec format error application/config/constants.php seems unchanged.
So that I want to change to kdiff3 to p4merge, Here also I'm getting an error like
warning: merge.tool has multiple values error: cannot overwrite multiple values with a single value Use a regexp, --add or --replace-all to change merge.tool.
How can I solve this problem? Either kdiff3 or p4merge
1 Answers
Answers 1
It is possible your kdiff3 installation is broken since it is not working. Or maybe you tried to edit config file manually and messed its content. why? Because windows executables have .exe extension in general. you may try editing config again.
Anyways, that is not important anymore. This is what you need to use if you want to try any other tool.
git mergetool --tool=p4merge There are possibly others already installed with your git. You can see all of them in addition to compatible others.
git mergetool --tool-help Edit: This command works only if you set your path to the tool correctly. Otherwise, you always get No files need merging result. You already know how to set the path, but I will include here for anyone else that might need.
Get the list of configuration items:
git config -l See if you already have values set correctly, if any. then set to correct value or remove.
git config --unset mergetool.p4merge.path git config --add mergetool.p4merge.path "c:/somewhere/p4merge.exe" 
0 comments:
Post a Comment