Using Visual Studio 2012's built-in merge tool with Git

后端 未结 3 1839
眼角桃花
眼角桃花 2020-12-07 11:48

So, I don\'t know if anyone\'s noticed but the new Merge Tool packaged with VS2012 is sick-o to the max. I\'ve recently moved to Git for my source control and really want to

3条回答
  •  眼角桃花
    2020-12-07 12:02

    Te solution marked as answered did not work for me, but this did (I had the vsdiffmerge.exe location in my path - don't know if it had anything to with it):

    [diff]
        tool = vsdiffmerge
        guitool = vsdiffmerge
    [difftool]
        prompt = true
    [difftool "vsdiffmerge"]
        cmd = $LOCAL $REMOTE /t
        keepbackup = false
        trustexistcode = true
        path = C:/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/IDE/vsDiffMerge.exe
    [merge]
        tool = vsdiffmerge
    [mergetool]
        prompt = false
    [mergetool "vsdiffmerge"]
        cmd = $REMOTE $LOCAL $BASE $MERGED /m
        keepbackup = false
        trustexitcode = true
        path = C:/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/IDE/vsDiffMerge.exe
    

提交回复
热议问题