Loading

set git p4diff tool

1, creat one file located in "C:\Users\[UserName]\" folder, named it as "difftool.sh".

and in the file, write the following words:

#!/bin/sh
p4merge "$2" "$5"

2,  open git bash window, 

type the following command words:

$ git config --global diff.external "c:/users/[UserName]/difftool.sh"

 

 

DONE.

posted @ 2012-03-29 21:16  .net's  阅读(381)  评论(0)    收藏  举报