.gitconfig 파일 수정
[merge]
tool = diffmerge
[mergetool "diffmerge"]
path = C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe
cmd = \"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe\" --merge --result=$MERGED $LOCAL $BASE $REMOTE
trustExitCode = true
[diff]
tool = diffmerge
[difftool "diffmerge"]
path = C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe
cmd = \"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe\" $LOCAL $REMOTE
댓글