配置p4merge for git on ubuntu

Ubuntu config p4merge for git

Download and install p4merge

Download address：http://www.perforce.com/perforce/products/merge.html

unzip the package :  $tar -xvf p4v.tar

copy the bin and lib folder to "/usr" dir using admim (sudo)

解压得到两个文件夹bin和lib，将这两个文件夹覆盖到/usr 目录（使用管理员权限）

 

2. 

$ sudo vim /usr/local/bin/extDiff

  #!/bin/bash  

  /usr/bin/p4merge "$2" "$5"  

1. $ sudo vim /usr/local/bin/extMerge
2.   #!/bin/sh
3.   /usr/bin/p4merge $*

$ sudo chmod +x /usr/local/bin/extDiff  

$ sudo chmod +x /usr/local/bin/extMerge

 

3.Edit ~/.gitconfig：add the following command:

1. [diff]  
2.     external = extDiff  
3. [gui]  
4.     spellingdictionary = none  
5. [mergetool]  
6.     trustExitCode = false  
7. [merge]  
8.     tool = p4merge  
9. [mergetool "p4merge"]  
10.     cmd = p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"