Friday, 30 August 2019

How to install P4Merge by Raj Gupta

Download and install it after that add the path(C:\Program Files\Perforce) to environment variable so that it can accessible from any where

https://www.perforce.com/downloads/visual-merge-tool


After setting path in environment variable when you give below command then it will open p4Merge


Administrator@EC2AMAZ-8EUJ4RB MINGW64 ~
$ p4merge





Now do the below configuration to use with git

Administrator@EC2AMAZ-8EUJ4RB MINGW64 ~
$ git config --global merge.tool p4merge

Administrator@EC2AMAZ-8EUJ4RB MINGW64 ~
$ git config --global mergetool.p4merge.path "C:/Program Files/Perforce/p4merge.exe"

Administrator@EC2AMAZ-8EUJ4RB MINGW64 ~
$ git config --global mergetool.prompt false

Administrator@EC2AMAZ-8EUJ4RB MINGW64 ~
$ git config --global diff.tool p4merge

Administrator@EC2AMAZ-8EUJ4RB MINGW64 ~
$ git config --global difftool.p4merge.path "C:/Program Files/Perforce/p4merge.exe"

Administrator@EC2AMAZ-8EUJ4RB MINGW64 ~
$ $ git config --global difftool.prompt false
bash: $: command not found

Administrator@EC2AMAZ-8EUJ4RB MINGW64 ~
$ git config --global difftool.prompt false

Administrator@EC2AMAZ-8EUJ4RB MINGW64 ~
$ git config --global --list
user.name=Raj Gupta
user.email=rajkumargupta14@gmail.com
alias.hist=log --all --graph --decorate --oneline
merge.tool=p4merge
mergetool.p4merge.path=C:/Program Files/Perforce/p4merge.exe
mergetool.prompt=false
diff.tool=p4merge
difftool.p4merge.path=C:/Program Files/Perforce/p4merge.exe
difftool.prompt=false



No comments:

Post a Comment