Skip to content

Instantly share code, notes, and snippets.

@ishisaka
Created October 15, 2015 01:45
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ishisaka/6dd0ebccf08447d1452f to your computer and use it in GitHub Desktop.
Save ishisaka/6dd0ebccf08447d1452f to your computer and use it in GitHub Desktop.
Visual StudioのDiff/MergeツールをGitのDiff/Mergeツールと使用するための設定
[diff]
tool = vsdiffmerge
[difftool]
prompt = true
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
keepbackup = false
trustexistcode = true
[merge]
tool = vsdiffmerge
[mergetool]
prompt = true
[mergetool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
keepbackup = false
trustexistcode = true
@ishisaka
Copy link
Author

パスは使用するVSのバージョンに合わせて適宜変更をお願いします。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment