12- Graphical Merge Tool

Git
1

Hello guy, can anyone help with this error from the Graphical Merge Tools video.

------ERROR-----
git mergetool
Merging:
change_password.txt

Normal merge conflict for ‘change_password.txt’:
{local}: created file
{remote}: created file
The merge tool p4merge is not available as ‘C:\Program Files\Perforce’

2

Actually just fixed this:
I changed the config setting to -

git config --global mergetool.p4merge.path “C:\Program Files\Perforce\p4merge”

I hope this helps someone

1 Like