joe-yang

摘要： 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 阅读全文

摘要： 1, creat one file located in "C:\Users\[UserName]\" folder, named it as "difftool.sh".and in the file, write the following words:#!/bin/shp4merge "$2" "$5"2, open git bash window,type the following command words:$ git config --global diff.external "c:/use 阅读全文