- Copie e cole o conteudo do .gitconfig(2012/2013) para o arquivo locallizado no C:\Users<SeuUserName>\
- Agora é só esperar algum conflito, seja de merge ou rebase, e usar a linha de comando a seguir:
git mergetool
git mergetool
[diff] | |
tool = vsdiffmerge | |
[difftool] | |
prompt = true | |
[difftool "vsdiffmerge"] | |
cmd = \""C:\\Program Files (x86)\\Microsoft Visual Studio 11.0\\Common7\\IDE\\vsdiffmerge.exe"\" \""$LOCAL"\" \""$REMOTE"\" //t | |
keepbackup = false | |
trustExitCode = false | |
[merge] | |
tool = vsdiffmerge | |
[mergetool] | |
prompt = true | |
keepbackup = false | |
[mergetool "vsdiffmerge"] | |
cmd = \""C:\\Program Files (x86)\\Microsoft Visual Studio 11.0\\Common7\\IDE\\vsdiffmerge.exe"\" \""$REMOTE"\" \""$LOCAL"\" \""$BASE"\" \""$MERGED"\" //m | |
keepbackup = false | |
trustExitCode = false |
[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 | |
trustExitCode = false | |
[merge] | |
tool = vsdiffmerge | |
[mergetool] | |
prompt = true | |
keepbackup = false | |
[mergetool "vsdiffmerge"] | |
cmd = \""C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe"\" \""$REMOTE"\" \""$LOCAL"\" \""$BASE"\" \""$MERGED"\" //m | |
keepbackup = false | |
trustExitCode = false |