Loading

set git p4merge tool

Open the .gitconfig file under the directory "c:\Users\[UserName]\.gitconfig",

append the following words:

[mergetool "p4merge"]

  cmd = "p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"

  keepTemporaries = false

  trustExitCode = false

  keepBackup = false

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