configurar p4merge para git

p4merge

p4merge*

Create a new text file in /usr/local/bin called p4merge and add the following lines:

#!/bin/sh
/home/usuario/Contents/MacOS/p4merge $*

Make the script executable by entering this command:

chmod +x p4merge

p4diff*

Create a new text file in /usr/local/bin called p4diff and add the following lines:

#!/bin/sh
[ $# -eq 7 ] && /usr/local/bin/p4merge "$2" "$5"

Make the script executable by entering this command:

chmod +x p4diff