Created
October 15, 2015 01:45
-
-
Save ishisaka/6dd0ebccf08447d1452f to your computer and use it in GitHub Desktop.
Visual StudioのDiff/MergeツールをGitのDiff/Mergeツールと使用するための設定
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
パスは使用するVSのバージョンに合わせて適宜変更をお願いします。