Git globalconfig 파일에서 difftool , mergetool 설정 하는 방법.

자주 사용하는 Diff Tool , Merge Tool 을 셋팅 해놓음. 아래 설정을 보고 .gitconfig를 입맛에 맞게 수정해 주면 된다.

[diff]
    tool = winmerge
[difftool]
    prompt = false
[difftool "p4diff"]
    cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
[difftool "vscode"]
    cmd = code --wait --diff $LOCAL $REMOTE
[difftool "winmerge"]
    name = WinMerge
    trustExitCode = true
cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE


[merge]
    tool = p4merge
[mergetool]
    prompt = false
[mergetool "p4merge"]
    cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool "winmerge"]
    name = WinMerge
    trustExitCode = true
    cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED
[mergetool "tortoisemerge"]
    cmd = TortoiseMerge.exe -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"