hayio
3/17/2017 - 5:09 PM

Install P4Merge git tool

Install P4Merge git tool

# Download app from https://www.perforce.com/downloads/helix (app name is HELIX P4V: VISUAL CLIENT)

git config --global merge.tool p4mergetool
git config --global mergetool.p4mergetool.cmd \
"/home/ralpher/programming/p4v-2017.1/bin/p4merge \$PWD/\$BASE \$PWD/\$REMOTE \$PWD/\$LOCAL \$PWD/\$MERGED"
git config --global mergetool.p4mergetool.trustExitCode false
git config --global mergetool.keepBackup false

git config --global diff.tool p4mergetool
git config --global difftool.p4mergetool.cmd \
"/home/ralpher/installs/p4v-2017.1/bin/p4merge \$LOCAL \$REMOTE"